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 5a06a5d..63a9396 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
@@ -40,8 +40,6 @@ public class Wallix {
 	
 	private final static String TOKEN_GUACAMOLE_USERNAME = "{GUAC_USERNAME}";
 	
-	private final static String TOKEN_GUACAMOLE_PASSWORD = "{GUAC_PASSWORD}";
-	
 	private static Wallix INSTANCE;
 	
 	private String url;
@@ -63,9 +61,9 @@ public class Wallix {
 		url = environment.getRequiredProperty(Configuration.WALLIX_URL);
 		user = environment.getRequiredProperty(Configuration.WALLIX_USER);
 		authKey = environment.getRequiredProperty(Configuration.WALLIX_AUTH_KEY);
-		usernamePrefix = environment.getRequiredProperty(Configuration.WALLIX_USERNAME_PREFIX);
+		usernamePrefix = environment.getProperty(Configuration.WALLIX_USERNAME_PREFIX, "");
 		usernameSuffix = environment.getProperty(Configuration.WALLIX_USERNAME_SUFFIX, TOKEN_GUACAMOLE_USERNAME);
-		userPassword = environment.getProperty(Configuration.WALLIX_USER_PASSWORD, TOKEN_GUACAMOLE_PASSWORD);
+		userPassword = environment.getProperty(Configuration.WALLIX_USER_PASSWORD);
 		connectionHost = environment.getRequiredProperty(Configuration.WALLIX_CONNECTION_HOST);
 	}