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 cee07ecae3203f7fca01296a53d5dd73c97ca250..5bdd4c779ee936b3aecaf46e788970399be36dbb 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
@@ -128,6 +128,10 @@ class KeycloakUserRemoteService {
 		var credentialsSecret = createUserSecret(userSpec.getKeycloakUser(), namespace);
 
 		var secret = getUserSecret(userSpec, namespace);
+
+		if (Objects.isNull(secret.get())) {
+			secret.create();
+		}
 		secret.patch(credentialsSecret);
 	}
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
index 64b3499cfd2e90c5ff8d814d0ed039944acb9b5e..9778ebf8d3f53bcfd5a31eba2ab4225556c0fe56 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
@@ -356,21 +356,21 @@ class KeycloakUserRemoteServiceTest {
 			verify(userRemoteService).getUserSecret(userSpec, NAMESPACE);
 		}
 
+		@Test
+		void shouldCreateSecretIfNotExists() {
+			when(secretResource.get()).thenReturn(null);
+
+			userRemoteService.createSecret(userSpec, NAMESPACE);
+
+			verify(secretResource).create();
+		}
+
 		@Test
 		void shouldPatchSecret() {
 			userRemoteService.createSecret(userSpec, NAMESPACE);
 
 			verify(secretResource).patch(secret);
 		}
-
-//		@Test
-//		void shouldCreateSecret() {
-//			doReturn(secret).when(userRemoteService).createUserSecret(any(), any());
-//
-//			userRemoteService.createSecret(userSpec, NAMESPACE);
-//
-//			verify(kubernetesRemoteService).createSecret(NAMESPACE, secret);
-//		}
 	}
 
 	@DisplayName("Create user secret")