Implemented review comments from 1cf6be2139d611a44d7507f658679358da697623
Implemented review comments from bd98ac1bce6adba0c92994653b94b03b6e7d7890. And fixed broken email-part of user.edit (not test-covered)