diff --git a/src/main/java/envoy/server/data/User.java b/src/main/java/envoy/server/data/User.java
index 6b26459..b356147 100755
--- a/src/main/java/envoy/server/data/User.java
+++ b/src/main/java/envoy/server/data/User.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.persistence.*;
 
+
 /**
  * This class serves as a way to let Hibernate communicate with the server
  * without bringing the dependency of JPA/Hibernate into the client.<br>
@@ -68,7 +69,7 @@ public class User {
 	 * @return a database {@link User} converted into an {@link envoy.data.User}
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public envoy.data.User toCommonUser() { return new envoy.data.User(id, name.equalsIgnoreCase("Maxi") ? "maxi" : name, status); }
+	public envoy.data.User toCommonUser() { return new envoy.data.User(id, name, status); }
 
 	/**
 	 * @return the id of a {link envoy.data.User}