diff --git a/backend/static/js/pages/onboarding.js b/backend/static/js/pages/onboarding.js
index 746dc63..5ba7638 100644
--- a/backend/static/js/pages/onboarding.js
+++ b/backend/static/js/pages/onboarding.js
@@ -337,10 +337,12 @@ window.Page_onboarding = (() => {
   // EVENTS
   // ----------------------------------------------------------
   function _bindEvents() {
-    // Weiter-Button (Schritt 1)
+    // Weiter-Button (Schritt 1) — direkt ins richtige Hunde-Profil,
+    // statt eines doppelten Mini-Formulars im Wizard. Onboarding gilt
+    // damit als erledigt, sobald der User dort angekommen ist.
     _container.querySelector('#ob-next-btn')?.addEventListener('click', () => {
-      _step = 2;
-      _render();
+      localStorage.setItem('by_onboarding_done', '1');
+      App.navigate('dog-profile');
     });
 
     // Zurück-Button (Schritt 2)
diff --git a/backend/static/js/worlds.js b/backend/static/js/worlds.js
index c6e05eb..52f3baa 100644
--- a/backend/static/js/worlds.js
+++ b/backend/static/js/worlds.js
@@ -1425,7 +1425,7 @@ window.Worlds = (() => {
             <div class="world-info-sub" style="margin-bottom:16px">
               Lege ein Profil an und schalte alle Features frei
             </div>
-            <button class="btn btn-primary" style="width:100%" onclick="Worlds.navigateTo('dog-profile')">
+            <button class="btn btn-primary" id="welcome-add-dog-btn" style="width:100%">
               Hund anlegen
             </button>
           </div>
@@ -1444,6 +1444,7 @@ window.Worlds = (() => {
           </div>
         </div>`;
       el.querySelectorAll('[data-wnav]').forEach(e => e.addEventListener('click', () => navigateTo(e.dataset.wnav)));
+      el.querySelector('#welcome-add-dog-btn')?.addEventListener('click', () => navigateTo('dog-profile'));
       return;
     }