diff --git a/jams-server/src/main/java/net/jami/jams/server/core/jaminamserver/LocalNameServer.java b/jams-server/src/main/java/net/jami/jams/server/core/jaminamserver/LocalNameServer.java
index a361e4e3d384c5136d34ffae162edfc203e91f7a..e8990b76b381a41af928f5dab0e6a4aa70d8f31f 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/jaminamserver/LocalNameServer.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/jaminamserver/LocalNameServer.java
@@ -25,22 +25,17 @@ public class LocalNameServer implements NameServer {
         StatementElement statementElement = new StatementElement("username","=",username,"");
         statementList.addStatement(statementElement);
         List<User> results = dataStore.getUserDao().getObjects(statementList);
-        if(results.size() == 0){
-            return null;
-        }
+        if(results.size() == 0) return null;
         return results.get(0).getAddress();
     }
 
     @Override
     public String getNameFromAddress(String address) {
         StatementList statementList = new StatementList();
-        //TODO: Check this.
-        StatementElement statementElement = new StatementElement("address","=",address,"");
+        StatementElement statementElement = new StatementElement("ethAddress","=",address,"");
         statementList.addStatement(statementElement);
         List<User> results = dataStore.getUserDao().getObjects(statementList);
-        if(results.size() == 0){
-            return null;
-        }
+        if(results.size() == 0) return null;
         return results.get(0).getUsername();
     }
 }