#747 Fix issue where validation would cause a user's usergroup memberships to be wiped
Prevent removal of user groups after validation fails

Merge remote-tracking branch 'origin/pr/750' into develop

* origin/pr/750:
  #747 Fix issue where validation would cause a user's usergroup memberships to be wiped