Optimize User class, Fix UserController