Fix conditional handling of users and groups in some services