diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java b/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java
index 42b3ed6ff..ba4dd775b 100644
--- a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java
+++ b/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java
@@ -18,7 +18,7 @@ public abstract class PerformanceTest {
 	@Test
 	public void runPerformanceTestCached() {
 
-		Certificate certificate = runtime().getPrivilegeHandler().authenticate("cached", "test".toCharArray());
+		Certificate certificate = runtime().getPrivilegeHandler().authenticate("cached", "cached".toCharArray());
 
 		ServiceHandler svcHandler = runtime().getServiceHandler();
 		svcHandler.doService(certificate, new PerformanceTestService(), argInstance());
@@ -27,7 +27,7 @@ public abstract class PerformanceTest {
 	@Test
 	public void runPerformanceTestTransactional() {
 
-		Certificate certificate = runtime().getPrivilegeHandler().authenticate("transactional", "test".toCharArray());
+		Certificate certificate = runtime().getPrivilegeHandler().authenticate("transactional", "transactional".toCharArray());
 
 		ServiceHandler svcHandler = runtime().getServiceHandler();
 		svcHandler.doService(certificate, new PerformanceTestService(), argInstance());
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java b/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java
index 90e8f3ccc..db39b84af 100644
--- a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java
+++ b/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java
@@ -50,7 +50,7 @@ public class PerformanceTransientTest {
 	@Test
 	public void runPerformanceTest() {
 
-		Certificate certificate = runtimeMock.getPrivilegeHandler().authenticate("transient", "test".toCharArray());
+		Certificate certificate = runtimeMock.getPrivilegeHandler().authenticate("transient", "transient".toCharArray());
 
 		ServiceHandler svcHandler = runtimeMock.getServiceHandler();
 		svcHandler.doService(certificate, new PerformanceTestService(), new PerformanceTestArgument());
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
index eae6ac714..e2846025f 100644
--- a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
+++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
@@ -75,7 +75,7 @@ public class DefaultEncryptionHandler implements EncryptionHandler {
 
 	@Override
 	public String nextToken() {
-		byte[] bytes = new byte[16];
+		byte[] bytes = new byte[32];
 		this.secureRandom.nextBytes(bytes);
 		return StringHelper.getHexString(bytes);
 	}
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
index f4b01f58c..6d9a7a43e 100644
--- a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
+++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
@@ -1286,10 +1286,6 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
 		// we only work with hashed passwords
 		byte[] passwordHash = this.encryptionHandler.hashPassword(password, salt);
 
-		logger.info("New hash: " + StringHelper.getHexString(passwordHash));
-		logger.info("User hash: " + StringHelper.getHexString(pwHash));
-		logger.info("User salt: " + StringHelper.getHexString(salt));
-
 		// validate password
 		if (!Arrays.equals(passwordHash, pwHash))
 			throw new InvalidCredentialsException(MessageFormat.format("Password is incorrect for {0}", username)); //$NON-NLS-1$