Added patch for assuming the default User and User.usernmae