Fix faulty handling of service account settings
Merge pull request #388 from nhr/installer_update_for_origin_v4

Fix faulty handling of service account settings