I'll change passwd to not require service=terminal anymore.