Fixing the User Model