diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java b/authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java
index efd55ecb26aece7a48aa740a49ed5063a44863fc..37362ed7e129d9e26868761d84b7939f7d7ccb47 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java
@@ -67,7 +67,7 @@ public class CrowdAuthenticationService implements IAuthenticationService
 
     private final String url;
     private final String application;
-    private final String applicationToken;
+    private final String applicationPassword;
 
 
     public CrowdAuthenticationService(String host, int port, String application, String applicationPassword)
@@ -79,11 +79,12 @@ public class CrowdAuthenticationService implements IAuthenticationService
     {
         this.url = url;
         this.application = application;
-        applicationToken = xmlEncode(execute("token", AUTHENTICATE_APPL, application, applicationPassword));
+        this.applicationPassword = applicationPassword;
     }
     
     public boolean authenticate(String user, String password)
     {
+        String applicationToken = xmlEncode(execute("token", AUTHENTICATE_APPL, application, applicationPassword));
         String userToken = xmlEncode(execute("out", AUTHENTICATE_USER, application, applicationToken, user, password));
         return userToken != null;
     }