Fix faulty handling of service account settings