This is a quick fix update. The main purpose is to fix an issue faced while creating/updating a user.
Surprisingly, we weren't able to spot that during test. We've also added new tests that cover that.
Changelog:
- Fixed: Issue while creating/editing a user fix #773 #770
