More UserController Updates