Merge "Minor improvements on UserController.java"