diff --git a/frontend/src/views/OnboardingView.vue b/frontend/src/views/OnboardingView.vue
index 646c29b..6439af7 100644
--- a/frontend/src/views/OnboardingView.vue
+++ b/frontend/src/views/OnboardingView.vue
@@ -946,10 +946,16 @@ async function confirmStep(step) {
     }
     if (step.action === "auto") {
       if (step.id === "firefly_password_rotated") {
-        await runRotationCheck("firefly");
+        const result = await runRotationCheck("firefly");
+        if (result && result.rotated === false) {
+          throw new Error("Firefly still uses the initial password. Change it in Firefly, then confirm again.");
+        }
       }
       if (step.id === "wger_password_rotated") {
-        await runRotationCheck("wger");
+        const result = await runRotationCheck("wger");
+        if (result && result.rotated === false) {
+          throw new Error("Wger still uses the initial password. Change it in Wger, then confirm again.");
+        }
       }
       await check();
       return;