diff --git a/src/main/java/cm/soungui/guacamole/ext/wallix/sync/Wallix.java b/src/main/java/cm/soungui/guacamole/ext/wallix/sync/Wallix.java
index 85e24fc..8c10a5d 100644
--- a/src/main/java/cm/soungui/guacamole/ext/wallix/sync/Wallix.java
+++ b/src/main/java/cm/soungui/guacamole/ext/wallix/sync/Wallix.java
@@ -37,6 +37,8 @@ public class Wallix {
 	
 	private final static String HEADER_AUTH_KEY = "X-Auth-Key";
 	
+	private final static String TOKEN_GUACAMOLE_USERNAME = "GUAC_USERNAME";
+	
 	private static Wallix INSTANCE;
 	
 	private String url;
@@ -226,7 +228,9 @@ public class Wallix {
 			        		HashMap<String, String> parameters = connection.getParameters();
 			        		parameters.put(Connection.Parameter.USERNAME, getFormattedUsername(accountNode, group.getName(), usernamePrefix));
 			        		parameters.put(Connection.Parameter.HOSTNAME, connectionHost);
-			        		connection.setName(parameters.get(Connection.Parameter.USERNAME).replace(":" + usernamePrefix + "${TOKEN_USERNAME}", ""));
+			        		StringBuffer connectionName = new StringBuffer(accountNode.findValue("account").asText())
+			        				.append("@").append(accountNode.findValue("device").asText());
+			        		connection.setName(connectionName.toString());
 			        		group.getConnections().add(connection);
 		        		}
 		        	});
@@ -249,7 +253,7 @@ public class Wallix {
 		buffer.append("@").append(accountNode.findValue("device").asText());
 		buffer.append(":").append(accountNode.findValue("service").asText());
 		buffer.append(":").append(targetGroupName);
-		buffer.append(":").append(usernamePrefix == null ? "" : usernamePrefix).append("${TOKEN_USERNAME}");
+		buffer.append(":").append(usernamePrefix == null ? "" : usernamePrefix).append("${" + TOKEN_GUACAMOLE_USERNAME + "}");
 		
 		return buffer.toString();
 	}