diff --git a/backend/src/main/java/de/svencarstensen/muh/service/CatalogService.java b/backend/src/main/java/de/svencarstensen/muh/service/CatalogService.java
index 56721d0..769fd3b 100644
--- a/backend/src/main/java/de/svencarstensen/muh/service/CatalogService.java
+++ b/backend/src/main/java/de/svencarstensen/muh/service/CatalogService.java
@@ -581,7 +581,7 @@ public class CatalogService {
                 normalizedEmail,
                 phoneNumber,
                 passwordEncoder.encode(mutation.password()),
-                true,
+                false,
                 UserRole.CUSTOMER,
                 100000L,
                 now,
@@ -601,13 +601,16 @@ public class CatalogService {
                 created.email(),
                 created.phoneNumber(),
                 created.passwordHash(),
-                created.active(),
+                false,
                 created.role(),
                 created.nextSampleNumber(),
                 created.createdAt(),
                 created.updatedAt()
         ));
-        return toSessionResponse(accountBound);
+        return new RegistrationResponse(accountBound.id(), accountBound.email());
+    }
+
+    public record RegistrationResponse(String userId, String email) {
     }
 
     public UserOption currentUser(String actorId) {
diff --git a/backend/src/main/java/de/svencarstensen/muh/service/SampleService.java b/backend/src/main/java/de/svencarstensen/muh/service/SampleService.java
index 38dd63c..3febef3 100644
--- a/backend/src/main/java/de/svencarstensen/muh/service/SampleService.java
+++ b/backend/src/main/java/de/svencarstensen/muh/service/SampleService.java
@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
diff --git a/backend/src/main/java/de/svencarstensen/muh/web/SessionController.java b/backend/src/main/java/de/svencarstensen/muh/web/SessionController.java
index 6e2ef56..d17b401 100644
--- a/backend/src/main/java/de/svencarstensen/muh/web/SessionController.java
+++ b/backend/src/main/java/de/svencarstensen/muh/web/SessionController.java
@@ -56,7 +56,7 @@ public class SessionController {
     }
 
     @PostMapping("/register")
-    public CatalogService.SessionResponse register(@RequestBody RegistrationRequest request) {
+    public CatalogService.RegistrationResponse register(@RequestBody RegistrationRequest request) {
         return catalogService.registerCustomer(new CatalogService.RegistrationMutation(
                 request.companyName(),
                 request.street(),
diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx
index e84c135..ce6423b 100644
--- a/frontend/src/pages/LoginPage.tsx
+++ b/frontend/src/pages/LoginPage.tsx
@@ -4,6 +4,11 @@ import { apiPost } from "../lib/api";
 import { useSession } from "../lib/session";
 import type { SessionResponse } from "../lib/types";
 
+interface RegistrationResponse {
+  userId: string;
+  email: string;
+}
+
 type FeedbackState =
   | { type: "error"; text: string }
   | { type: "success"; text: string }
@@ -86,14 +91,24 @@ export default function LoginPage() {
       setFeedback(null);
       const { passwordConfirmation, ...registrationPayload } = registration;
       void passwordConfirmation;
-      const response = await apiPost<SessionResponse>("/session/register", registrationPayload);
+      const response = await apiPost<RegistrationResponse>("/session/register", registrationPayload);
       setFeedback({
         type: "success",
-        text: `Registrierung erfolgreich. Willkommen ${response.user.companyName ?? response.user.displayName}.`,
+        text: `Registrierung erfolgreich. Ihr Account (${response.email}) wurde angelegt und muss durch einen Administrator freigegeben werden. Sie werden benachrichtigt, sobald die Freigabe erfolgt ist.`,
       });
-      setSession(response);
-      // Admin zum Dashboard, Kunden zur Startseite
-      navigate(response.user.role === "ADMIN" ? "/admin/dashboard" : "/home");
+      // Reset registration form and switch back to login
+      setRegistration({
+        companyName: "",
+        street: "",
+        houseNumber: "",
+        postalCode: "",
+        city: "",
+        email: "",
+        phoneNumber: "",
+        password: "",
+        passwordConfirmation: "",
+      });
+      setShowRegistration(false);
     } catch (registrationError) {
       setFeedback({ type: "error", text: (registrationError as Error).message });
     }