keycloak-aplcache

diff --git a/model/api/src/main/java/org/keycloak/models/UserFederationProvider.java b/model/api/src/main/java/org/keycloak/models/UserFederationProvider.java
index 9403a39..16e81b5 100755
--- a/model/api/src/main/java/org/keycloak/models/UserFederationProvider.java
+++ b/model/api/src/main/java/org/keycloak/models/UserFederationProvider.java
@@ -16,7 +16,7 @@ public interface UserFederationProvider extends Provider {
 
     public static final String USERNAME = UserModel.USERNAME;
     public static final String EMAIL = UserModel.EMAIL;
-    public static final String FIRST_NAME = UserModel.EMAIL;
+    public static final String FIRST_NAME = UserModel.FIRST_NAME;
     public static final String LAST_NAME = UserModel.LAST_NAME;
 
     /**

diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoUserProvider.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoUserProvider.java
index bba9de4..72340d0 100755
--- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoUserProvider.java
+++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/MongoUserProvider.java
@@ -287,7 +287,7 @@ public class MongoUserProvider implements UserProvider {
     @Override
     public boolean removeUser(RealmModel realm, UserModel user) {
         DBObject query = new QueryBuilder()
-                .and("id").is(user.getId())
+                .and("_id").is(user.getId())
                 .and("realmId").is(realm.getId())
                 .get();
         return getMongoStore().removeEntities(MongoUserEntity.class, query, invocationContext);