Fix user and  group creation upon applying