More user_model related fixes