Fixes in new User_Model