diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
index ae3f4b6067c6351f5992f28b65f28f1d56813ae6..03da0612d082d60eec3d1fe95a6043c4c1f73903 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
@@ -120,22 +120,21 @@ class KeycloakUserRemoteService {
 		log.log(Level.INFO, "Create secret for user: " + userSpec.getKeycloakUser().getUsername());
 		var secretName = userSpec.getKeycloakUser().getUsername().toLowerCase() + "-credentials";
 
-		var namespace = "keycloak";
+		var namespace = createdNamespace;
 		var secret = getSecret(secretName, namespace);
 		if (Objects.isNull(secret.get())) {
 			log.log(Level.INFO, "...secret does not exist, create one...");
 
-			kubernetesClient.secrets().inNamespace(namespace).create(buildSecret(secretName));
+			var credentialsSecret = buildSecret(secretName, userSpec.getKeycloakUser().getPassword());
+			kubernetesClient.secrets().inNamespace(namespace).create(credentialsSecret);
 
 			log.log(Level.INFO, "...secret created '" + secretName + "' in " + namespace + " for user " + userSpec.getKeycloakUser().getUsername());
-			log.log(Level.INFO, "...load created secret...");
-			var createdSecret = getSecret(secretName, namespace);
-			var newPassword = getPassword(createdSecret);
+			var newPassword = getPassword(getSecret(secretName, namespace));
 			log.log(Level.INFO, "return password from created secret:" + newPassword);
 			return newPassword;
 		}
 		var password = getPassword(secret);
-		log.log(Level.INFO, "secret exists, return password:" + password);
+		log.log(Level.INFO, "secret exists, return with password:" + password);
 		return password;
 	}
 
@@ -143,7 +142,7 @@ class KeycloakUserRemoteService {
 		return kubernetesClient.secrets().inNamespace(namespace).withName(secretName);
 	}
 
-	Secret buildSecret(String name) {
+	Secret buildSecret(String name, String password) {
 		var metadata = new ObjectMeta();
 		metadata.setName(name);
 		metadata.setGenerateName(name);
@@ -152,7 +151,7 @@ class KeycloakUserRemoteService {
 		return new SecretBuilder()
 				.withType("Opaque")
 				.withMetadata(metadata)
-				.addToStringData(SECRET_PASSWORD_FIELD, "123Test")
+				.addToStringData(SECRET_PASSWORD_FIELD, password)
 				.addToStringData(SECRET_NAME_FIELD, name)
 				.build();
 	}