united UsersController into one