Started refactoring the user management (#745)