Merge branch 'hotfix/edit_recovery_password_page'

* hotfix/edit_recovery_password_page:
  form renewed
edit users/form
Merge branch 'hotfix/edit_users_new' into develop

* hotfix/edit_users_new:
  edit users/form