Even more UsersController refactoring