Fix user settings update / delete
Fix user group settings update / delete
User / User Group Settings update and delete fix

* origin/pr/11795:
  Fix user group settings update / delete
  Fix user settings update / delete