fix users/groups for civicrm

Change-Id: I9c6c025ad1f4d66c3a2125a7ca7bdfa3d165d0a5