diff --git a/pages/admin/departments/_form.phtml b/pages/admin/departments/_form.phtml
index 406b6a2..0efa95a 100644
--- a/pages/admin/departments/_form.phtml
+++ b/pages/admin/departments/_form.phtml
@@ -30,7 +30,7 @@ $disabledAttr = $isReadOnly ? 'disabled' : '';
 
 ?>
 <form id="<?php e($formId); ?>" method="post" data-standard-detail-form="1">
-  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-department-form">
+  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-department-form"<?php if (!empty($ignoreTabStorage)) { echo ' data-tabs-ignore-storage'; } ?>>
     <div class="app-tabs-nav">
       <button type="button" data-tab="basic" data-tab-default><?php e(t('Master data')); ?></button>
       <button type="button" data-tab="visibility"><?php e(t('Visibility')); ?></button>
diff --git a/pages/admin/departments/create(default).phtml b/pages/admin/departments/create(default).phtml
index 7c63006..4bbfadf 100644
--- a/pages/admin/departments/create(default).phtml
+++ b/pages/admin/departments/create(default).phtml
@@ -57,6 +57,7 @@
     <?php
     $values = $form ?? [];
     $detailsOpenAll = true;
+    $ignoreTabStorage = true;
     require __DIR__ . '/_form.phtml';
     ?>
   </section>
diff --git a/pages/admin/permissions/_form.phtml b/pages/admin/permissions/_form.phtml
index 253dcd4..6e9202f 100644
--- a/pages/admin/permissions/_form.phtml
+++ b/pages/admin/permissions/_form.phtml
@@ -32,7 +32,7 @@ $keyReadonlyAttr = ($isReadOnly || !empty($values['is_system'])) ? 'readonly' :
 
 ?>
 <form id="<?php e($formId); ?>" method="post" data-standard-detail-form="1">
-  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-permission-form">
+  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-permission-form"<?php if (!empty($ignoreTabStorage)) { echo ' data-tabs-ignore-storage'; } ?>>
     <div class="app-tabs-nav">
       <button type="button" data-tab="basic" data-tab-default><?php e(t('Master data')); ?></button>
       <?php if ($roles): ?>
diff --git a/pages/admin/permissions/create(default).phtml b/pages/admin/permissions/create(default).phtml
index 269c3db..65fdb02 100644
--- a/pages/admin/permissions/create(default).phtml
+++ b/pages/admin/permissions/create(default).phtml
@@ -45,6 +45,7 @@
     <?php
     $values = $form ?? [];
     $detailsOpenAll = true;
+    $ignoreTabStorage = true;
     require __DIR__ . '/_form.phtml';
     ?>
   </section>
diff --git a/pages/admin/roles/_form.phtml b/pages/admin/roles/_form.phtml
index be5a52d..ebdcca5 100644
--- a/pages/admin/roles/_form.phtml
+++ b/pages/admin/roles/_form.phtml
@@ -31,7 +31,7 @@ $selectedAssignableRoleIds = is_array($selectedAssignableRoleIds ?? null) ? $sel
 
 ?>
 <form id="<?php e($formId); ?>" method="post" data-standard-detail-form="1">
-  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-role-form">
+  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-role-form"<?php if (!empty($ignoreTabStorage)) { echo ' data-tabs-ignore-storage'; } ?>>
     <div class="app-tabs-nav">
       <button type="button" data-tab="basic" data-tab-default><?php e(t('Master data')); ?></button>
       <button type="button" data-tab="permissions"><?php e(t('Permissions')); ?></button>
diff --git a/pages/admin/roles/create(default).phtml b/pages/admin/roles/create(default).phtml
index a30a69b..fdb3be5 100644
--- a/pages/admin/roles/create(default).phtml
+++ b/pages/admin/roles/create(default).phtml
@@ -45,6 +45,7 @@
     <?php
     $values = $form ?? [];
     $detailsOpenAll = true;
+    $ignoreTabStorage = true;
     require __DIR__ . '/_form.phtml';
     ?>
   </section>
diff --git a/pages/admin/tenants/_form.phtml b/pages/admin/tenants/_form.phtml
index 97c9717..4d6018d 100644
--- a/pages/admin/tenants/_form.phtml
+++ b/pages/admin/tenants/_form.phtml
@@ -144,7 +144,7 @@ $openOverrideCard = $detailsOpenAll;
 
 ?>
 <form id="<?php e($formId); ?>" method="post" data-standard-detail-form="1">
-  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-tenant-form">
+  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-tenant-form"<?php if (!empty($ignoreTabStorage)) { echo ' data-tabs-ignore-storage'; } ?>>
     <div class="app-tabs-nav">
       <button type="button" data-tab="basic" data-tab-default><?php e(t('Master data')); ?></button>
       <?php if ($showCustomFieldsTab): ?>
diff --git a/pages/admin/tenants/create(default).phtml b/pages/admin/tenants/create(default).phtml
index b53dfa5..5d39f57 100644
--- a/pages/admin/tenants/create(default).phtml
+++ b/pages/admin/tenants/create(default).phtml
@@ -51,6 +51,7 @@
     $showSsoTab = (bool) ($canManageSso ?? false);
     $customFieldTenantUuid = '';
     $customFieldDefinitions = [];
+    $ignoreTabStorage = true;
     require __DIR__ . '/_form.phtml';
     ?>
   </section>
diff --git a/pages/admin/users/_form.phtml b/pages/admin/users/_form.phtml
index 86d23aa..d6db5e9 100644
--- a/pages/admin/users/_form.phtml
+++ b/pages/admin/users/_form.phtml
@@ -122,7 +122,7 @@ foreach ($tenants as $tenant) {
 
 ?>
 <form id="<?php e($formId); ?>" method="post" data-details-storage="admin-user-form-details-v1" data-standard-detail-form="1">
-  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-user-form">
+  <div class="app-tabs" data-tabs data-tabs-param="tab" data-tabs-storage-key="admin-user-form"<?php if (!empty($ignoreTabStorage)) { echo ' data-tabs-ignore-storage'; } ?>>
     <div class="app-tabs-nav">
       <button type="button" data-tab="profile" data-tab-default><?php e(t('Master data')); ?></button>
       <?php if ($showOrganizationTab): ?>
diff --git a/pages/admin/users/create(default).phtml b/pages/admin/users/create(default).phtml
index 8f775d2..a7c2d20 100644
--- a/pages/admin/users/create(default).phtml
+++ b/pages/admin/users/create(default).phtml
@@ -69,6 +69,7 @@
     $customFieldPostedValues = $customFieldPostedValues ?? [];
     $passwordMinLength = $passwordMinLength ?? 12;
     $passwordHints = $passwordHints ?? [];
+    $ignoreTabStorage = true;
     require __DIR__ . '/_form.phtml';
     ?>
   </section>
diff --git a/web/js/components/app-tabs.js b/web/js/components/app-tabs.js
index f02ca4c..6ae3da0 100644
--- a/web/js/components/app-tabs.js
+++ b/web/js/components/app-tabs.js
@@ -49,7 +49,7 @@ export function initTabs(root = document) {
     const urlTab = getUrlParam(urlParamName);
     if (urlTab && panels.some(p => p.dataset.tabPanel === urlTab)) {
       activeTab = urlTab;
-    } else if (storageKey) {
+    } else if (storageKey && !container.hasAttribute('data-tabs-ignore-storage')) {
       try {
         const stored = localStorage.getItem(storageKey);
         if (stored && panels.some(p => p.dataset.tabPanel === stored)) {