Moved 2 method's from UserController to User