Merged fix for check of user account when installing service