diff --git a/src/components/admin/ResultTable.spec.ts b/src/components/admin/ResultTable.spec.ts
index 434f69da4..b638a6ff8 100644
--- a/src/components/admin/ResultTable.spec.ts
+++ b/src/components/admin/ResultTable.spec.ts
@@ -1,29 +1,38 @@
-import { expect, test } from 'vitest';
-import { VueWrapper, mount } from '@vue/test-utils';
+import { expect, test, describe, beforeEach } from 'vitest';
+import { DOMWrapper, VueWrapper, mount } from '@vue/test-utils';
 import ResultTable from './ResultTable.vue';
 import type { VDataTableServer } from 'vuetify/lib/components/index.mjs';
+import type { VueNode } from '@vue/test-utils/dist/types';
 
 let wrapper: VueWrapper | null = null;
 
+const mockItems: {
+  id: number;
+  name: string;
+}[] = [
+  { id: 1, name: 'Alice' },
+  { id: 2, name: 'Bob' },
+  { id: 3, name: 'Charlie' },
+];
+
 beforeEach(() => {
   document.body.innerHTML = `
     <div>
       <div id="app"></div>
     </div>
-    `;
+  `;
+
   type ReadonlyHeaders = InstanceType<typeof VDataTableServer>['headers'];
-  const headers: ReadonlyHeaders = [{ title: 'title', key: 'key', align: 'start' }];
+  const headers: ReadonlyHeaders = [{ title: 'Name', key: 'name', align: 'start' }];
 
   wrapper = mount(ResultTable, {
     attachTo: document.getElementById('app') || '',
     props: {
-      items: [],
+      items: mockItems,
       itemsPerPage: 10,
       loading: false,
-      password: 'qwertzuiop',
       totalItems: 25,
       headers: headers,
-      header: 'header',
       itemValuePath: 'id',
       disableRowClick: false,
     },
@@ -35,8 +44,78 @@ beforeEach(() => {
   });
 });
 
-describe('result table', () => {
-  test('it renders the result table', () => {
-    expect(wrapper?.get('[data-testid="result-table"]')).not.toBeNull();
+describe('Row Index and Item Retrieval', () => {
+  test('manually find row index in DOM and match corresponding item', () => {
+    // Simulate getting rows and finding index
+    const tbody: DOMWrapper<HTMLTableSectionElement> | undefined = wrapper?.find('tbody');
+    const rows: DOMWrapper<HTMLTableRowElement>[] | undefined = tbody?.findAll('tr');
+
+    // Verify we have correct number of rows matching mock items
+    expect(rows?.length).toBe(mockItems.length);
+
+    rows?.forEach((row: DOMWrapper<HTMLTableRowElement>, domIndex: number) => {
+      // Convert row to raw DOM element
+      const rowElement: VueNode<HTMLTableRowElement> = row.element;
+
+      // Simulate finding parent and converting to array
+      const rowsArray: Element[] = Array.from(rowElement.parentElement!.children);
+
+      // Find index of current row
+      const calculatedIndex: number = rowsArray.indexOf(rowElement);
+
+      // Verify calculated index matches expected DOM index
+      expect(calculatedIndex).toBe(domIndex);
+
+      // Verify item retrieval matches our mock data
+      // This simulates the logic in the component
+      const retrievedItem:
+        | {
+            id: number;
+            name: string;
+          }
+        | undefined = mockItems[calculatedIndex];
+      expect(retrievedItem).toEqual(mockItems[domIndex]);
+    });
+  });
+
+  test('row index matches item array order', () => {
+    const tbody: DOMWrapper<HTMLTableSectionElement> | undefined = wrapper?.find('tbody');
+    const rows: DOMWrapper<HTMLTableRowElement>[] | undefined = tbody?.findAll('tr');
+
+    rows?.forEach((row: DOMWrapper<HTMLTableRowElement>, index: number) => {
+      const rowElement: VueNode<HTMLTableRowElement> = row.element;
+      const rowsArray: Element[] = Array.from(rowElement.parentElement!.children);
+      const calculatedIndex: number = rowsArray.indexOf(rowElement);
+
+      expect(calculatedIndex).toBe(index);
+    });
+  });
+  test('handles empty items array', () => {
+    // Remount with empty items
+    wrapper = mount(ResultTable, {
+      props: {
+        items: [],
+        itemsPerPage: 10,
+        loading: false,
+        totalItems: 0,
+        headers: [{ title: 'Name', key: 'name', align: 'start' }],
+        itemValuePath: 'id',
+        disableRowClick: false,
+      },
+    });
+
+    const tbody: DOMWrapper<HTMLTableSectionElement> = wrapper.find('tbody');
+    const rows: DOMWrapper<HTMLTableRowElement>[] = tbody.findAll('tr');
+
+    // Use the prop passed to the component to check for no data
+    const noDataText: string | undefined = wrapper.find('[data-testid="result-table"]').attributes('no-data-text');
+
+    // Either no rows or only a single "no data" row
+    expect(rows.length).toBeLessThanOrEqual(1);
+
+    // Optional: Check for specific no data text if needed
+    if (rows.length === 1) {
+      expect(rows[0]?.text()).toContain(noDataText || 'Keine Daten gefunden.');
+    }
   });
 });
diff --git a/src/components/admin/ResultTable.vue b/src/components/admin/ResultTable.vue
index 75eebfbfb..b9052dbd5 100644
--- a/src/components/admin/ResultTable.vue
+++ b/src/components/admin/ResultTable.vue
@@ -4,7 +4,7 @@
    */
   import { SortOrder } from '@/stores/PersonStore';
   import { useSearchFilterStore, type SearchFilterStore } from '@/stores/SearchFilterStore';
-  import { onMounted } from 'vue';
+  import { onMounted, onUnmounted } from 'vue';
   import type { VDataTableServer } from 'vuetify/lib/components/index.mjs';
 
   const searchFilterStore: SearchFilterStore = useSearchFilterStore();
@@ -46,6 +46,39 @@
 
   const emit: Emits = defineEmits<Emits>();
 
+  function handleKeyDown(event: KeyboardEvent): void {
+    // Check if the pressed key is Enter
+    if (event.key === 'Enter') {
+      const target: HTMLElement = event.target as HTMLElement;
+
+      // Check if the target or its closest parent is a header checkbox, if so then we shouldn't trigger anything when "Enter" is pressed as it's not a table row.
+      const isHeaderCheckbox: boolean =
+        target.closest('thead')?.querySelector('input[type="checkbox"]') === target ||
+        target.querySelector('input[type="checkbox"]') !== null;
+
+      // If it's a header checkbox, do nothing
+      if (isHeaderCheckbox) {
+        return;
+      }
+
+      const row: HTMLTableRowElement | null = target.closest('tr');
+
+      if (row) {
+        // Find the corresponding item for this row.
+        const rowIndex: number = Array.from(row.parentElement!.children).indexOf(row);
+        const item: TableItem | undefined = props.items[rowIndex];
+
+        if (item) {
+          // Prevent default Enter key behavior
+          event.preventDefault();
+
+          // Emit the same event as handleRowClick
+          emit('onHandleRowClick', event as unknown as PointerEvent, { item });
+        }
+      }
+    }
+  }
+
   function handleRowClick(event: PointerEvent, item: TableRow<unknown>): void {
     if (!props.disableRowClick) {
       emit('onHandleRowClick', event, item);
@@ -94,6 +127,11 @@
         });
       }
     }
+    window.addEventListener('keydown', handleKeyDown);
+  });
+
+  onUnmounted(() => {
+    window.removeEventListener('keydown', handleKeyDown);
   });
 </script>
 
diff --git a/src/components/admin/personen/PasswordReset.vue b/src/components/admin/personen/PasswordReset.vue
index 390ab3b62..33a41fb99 100644
--- a/src/components/admin/personen/PasswordReset.vue
+++ b/src/components/admin/personen/PasswordReset.vue
@@ -37,6 +37,8 @@
         firstname: props.person.person.name.vorname,
         lastname: props.person.person.name.familienname,
       })}`;
+    } else {
+      message = `${t('admin.person.resetPasswordSuccessMessage')}\n\n` + message;
     }
     return message;
   });
@@ -155,7 +157,7 @@
                 </p>
               </v-col>
             </v-row>
-            <v-row>
+            <v-row class="px-md-16">
               <v-col cols="12">
                 <PasswordOutput :password="password"></PasswordOutput>
               </v-col>
diff --git a/src/components/form/KlasseForm.vue b/src/components/form/KlasseForm.vue
index 9feb1dea6..050701850 100644
--- a/src/components/form/KlasseForm.vue
+++ b/src/components/form/KlasseForm.vue
@@ -14,6 +14,7 @@
   const personenkontextStore: PersonenkontextStore = usePersonenkontextStore();
 
   type Props = {
+    errorCode?: string;
     schulen?: Array<{ value: string; title: string }>;
     readonly?: boolean;
     selectedSchuleProps?: BaseFieldProps & { error: boolean; 'error-messages': Array<string> };
@@ -83,7 +84,7 @@
     :confirmUnsavedChangesAction="onHandleConfirmUnsavedChanges"
     :createButtonLabel="$t('admin.klasse.create')"
     :discardButtonLabel="$t('admin.klasse.discard')"
-    :hideActions="readonly"
+    :hideActions="readonly || !!props.errorCode"
     id="klasse-form"
     :isLoading="isLoading"
     :onDiscard="onHandleDiscard"
@@ -91,63 +92,68 @@
     :onSubmit="onSubmit"
     :showUnsavedChangesDialog="showUnsavedChangesDialog"
   >
-    <!-- Schule zuordnen -->
-    <v-row>
-      <h3 class="headline-3">1. {{ $t('admin.schule.assignSchule') }}</h3>
-    </v-row>
-    <FormRow
-      :errorLabel="selectedSchuleProps?.error || ''"
-      labelForId="schule-select"
-      :isRequired="true"
-      :label="$t('admin.schule.schule')"
-    >
-      <v-autocomplete
-        autocomplete="off"
-        :class="[{ 'filter-dropdown mb-4': hasAutoselectedSchule }, { selected: selectedSchule }]"
-        clearable
-        data-testid="schule-select"
-        density="compact"
-        :disabled="hasAutoselectedSchule || readonly"
-        id="schule-select"
-        :items="schulen"
-        item-value="value"
-        item-text="title"
-        :no-data-text="$t('noDataFound')"
-        :placeholder="$t('admin.schule.assignSchule')"
-        ref="schule-select"
-        required="true"
-        variant="outlined"
-        v-bind="selectedSchuleProps"
-        v-model="selectedSchule"
-        v-model:search="searchInputSchule"
-        hide-details
-      ></v-autocomplete>
-    </FormRow>
+    <!-- Slot for SPSH alerts -->
+    <slot />
 
-    <!-- Klassenname eingeben -->
-    <v-row class="mt-8">
-      <h3 class="headline-3">2. {{ $t('admin.klasse.enterKlassenname') }}</h3>
-    </v-row>
-    <FormRow
-      :errorLabel="selectedKlassennameProps?.error || ''"
-      labelForId="klassenname-input"
-      :isRequired="true"
-      :label="$t('admin.klasse.klassenname')"
-    >
-      <v-text-field
-        clearable
-        data-testid="klassenname-input"
-        density="compact"
-        :disabled="!isEditActive"
-        id="klassenname-input"
-        :placeholder="$t('admin.klasse.enterKlassenname')"
-        ref="klassenname-input"
-        required="true"
-        variant="outlined"
-        v-bind="selectedKlassennameProps"
-        v-model="selectedKlassenname"
-      ></v-text-field>
-    </FormRow>
+    <template v-if="!props.errorCode">
+      <!-- Schule zuordnen -->
+      <v-row>
+        <h3 class="headline-3">1. {{ $t('admin.schule.assignSchule') }}</h3>
+      </v-row>
+      <FormRow
+        :errorLabel="selectedSchuleProps?.error || ''"
+        labelForId="schule-select"
+        :isRequired="true"
+        :label="$t('admin.schule.schule')"
+      >
+        <v-autocomplete
+          autocomplete="off"
+          :class="[{ 'filter-dropdown mb-4': hasAutoselectedSchule }, { selected: selectedSchule }]"
+          clearable
+          data-testid="schule-select"
+          density="compact"
+          :disabled="hasAutoselectedSchule || readonly"
+          id="schule-select"
+          :items="schulen"
+          item-value="value"
+          item-text="title"
+          :no-data-text="$t('noDataFound')"
+          :placeholder="$t('admin.schule.assignSchule')"
+          ref="schule-select"
+          required="true"
+          variant="outlined"
+          v-bind="selectedSchuleProps"
+          v-model="selectedSchule"
+          v-model:search="searchInputSchule"
+          hide-details
+        ></v-autocomplete>
+      </FormRow>
+
+      <!-- Klassenname eingeben -->
+      <v-row class="mt-8">
+        <h3 class="headline-3">2. {{ $t('admin.klasse.enterKlassenname') }}</h3>
+      </v-row>
+      <FormRow
+        :errorLabel="selectedKlassennameProps?.error || ''"
+        labelForId="klassenname-input"
+        :isRequired="true"
+        :label="$t('admin.klasse.klassenname')"
+      >
+        <v-text-field
+          clearable
+          data-testid="klassenname-input"
+          density="compact"
+          :disabled="!isEditActive"
+          id="klassenname-input"
+          :placeholder="$t('admin.klasse.enterKlassenname')"
+          ref="klassenname-input"
+          required="true"
+          variant="outlined"
+          v-bind="selectedKlassennameProps"
+          v-model="selectedKlassenname"
+        ></v-text-field>
+      </FormRow>
+    </template>
   </FormWrapper>
 </template>
 
diff --git a/src/components/form/RolleForm.vue b/src/components/form/RolleForm.vue
index ee2519023..93297ff5b 100644
--- a/src/components/form/RolleForm.vue
+++ b/src/components/form/RolleForm.vue
@@ -9,6 +9,7 @@
   type Props = {
     administrationsebenen?: Array<{ value: string; title: string }>;
     readonly?: boolean;
+    errorCode?: string;
     selectedAdministrationsebeneProps?: BaseFieldProps & { error: boolean; 'error-messages': Array<string> };
     selectedRollenArtProps?: BaseFieldProps & { error: boolean; 'error-messages': Array<string> };
     selectedRollenNameProps?: BaseFieldProps & { error: boolean; 'error-messages': Array<string> };
@@ -28,7 +29,7 @@
     onSubmit: () => void;
   };
 
-  defineProps<Props>();
+  const props: Props = defineProps<Props>();
 
   // Define the V-model for each field so the parent component can pass in the values for it.
   const selectedAdministrationsebene: ModelRef<string | undefined, string> =
@@ -45,7 +46,7 @@
     :confirmUnsavedChangesAction="onHandleConfirmUnsavedChanges"
     :createButtonLabel="$t('admin.rolle.create')"
     :discardButtonLabel="$t('admin.rolle.discard')"
-    :hideActions="readonly"
+    :hideActions="readonly || !!props.errorCode"
     id="rolle-form"
     :isLoading="isLoading"
     :onDiscard="onHandleDiscard"
@@ -54,177 +55,182 @@
     ref="form-wrapper"
     :showUnsavedChangesDialog="showUnsavedChangesDialog"
   >
-    <!-- 1. Administrationsebene zuordnen -->
-    <v-row>
-      <h3 class="headline-3">1. {{ $t('admin.administrationsebene.assignAdministrationsebene') }}</h3>
-    </v-row>
-    <FormRow
-      :errorLabel="selectedAdministrationsebeneProps?.error || ''"
-      labelForId="administrationsebene-select"
-      :isRequired="true"
-      :label="$t('admin.administrationsebene.administrationsebene')"
-    >
-      <v-select
-        clearable
-        data-testid="administrationsebene-select"
-        density="compact"
-        :disabled="readonly"
-        id="administrationsebene-select"
-        :items="administrationsebenen"
-        item-value="value"
-        item-text="title"
-        :no-data-text="$t('noDataFound')"
-        :placeholder="$t('admin.administrationsebene.assignAdministrationsebene')"
-        ref="administrationsebene-select"
-        required="true"
-        variant="outlined"
-        v-bind="selectedAdministrationsebeneProps"
-        v-model="selectedAdministrationsebene"
-      ></v-select>
-    </FormRow>
+    <!-- Slot for SPSH alerts -->
+    <slot />
 
-    <!-- 2. Rollenart zuordnen -->
-    <v-row>
-      <h3 class="headline-3">2. {{ $t('admin.rolle.assignRollenart') }}</h3>
-    </v-row>
-    <FormRow
-      :errorLabel="selectedRollenArtProps?.error || ''"
-      labelForId="rollenart-select"
-      :isRequired="true"
-      :label="$t('admin.rolle.rollenart')"
-    >
-      <v-select
-        clearable
-        data-testid="rollenart-select"
-        density="compact"
-        :disabled="readonly"
-        id="rollenart-select"
-        :items="translatedRollenarten"
-        item-value="value"
-        item-text="title"
-        :no-data-text="$t('noDataFound')"
-        :placeholder="$t('admin.rolle.selectRollenart')"
-        ref="rollenart-select"
-        required="true"
-        variant="outlined"
-        v-bind="selectedRollenArtProps"
-        v-model="selectedRollenArt"
-      ></v-select>
-    </FormRow>
-
-    <template v-if="selectedRollenArt && selectedAdministrationsebene">
-      <!-- 3. Rollenname eingeben -->
+    <template v-if="!props.errorCode">
+      <!-- 1. Administrationsebene zuordnen -->
       <v-row>
-        <h3 class="headline-3">3. {{ $t('admin.rolle.enterRollenname') }}</h3>
+        <h3 class="headline-3">1. {{ $t('admin.administrationsebene.assignAdministrationsebene') }}</h3>
       </v-row>
       <FormRow
-        :errorLabel="selectedRollenNameProps?.error || ''"
-        labelForId="rollenname-input"
+        :errorLabel="selectedAdministrationsebeneProps?.error || ''"
+        labelForId="administrationsebene-select"
         :isRequired="true"
-        :label="$t('admin.rolle.rollenname')"
-      >
-        <v-text-field
-          clearable
-          data-testid="rollenname-input"
-          density="compact"
-          :disabled="!isEditActive"
-          id="rollenname-input"
-          :placeholder="$t('admin.rolle.enterRollenname')"
-          ref="rollenname-input"
-          required="true"
-          variant="outlined"
-          v-bind="selectedRollenNameProps"
-          v-model="selectedRollenName"
-        ></v-text-field>
-      </FormRow>
-
-      <!-- 4. Merkmale zuordnen -->
-      <v-row>
-        <h3 class="headline-3">4. {{ $t('admin.rolle.assignMerkmale') }}</h3>
-      </v-row>
-      <FormRow
-        :errorLabel="selectedMerkmaleProps?.error || ''"
-        labelForId="merkmale-select"
-        :label="$t('admin.rolle.merkmale')"
+        :label="$t('admin.administrationsebene.administrationsebene')"
       >
         <v-select
-          chips
           clearable
-          data-testid="merkmale-select"
+          data-testid="administrationsebene-select"
           density="compact"
-          :disabled="!isEditActive"
-          id="merkmale-select"
-          :items="translatedMerkmale"
+          :disabled="readonly"
+          id="administrationsebene-select"
+          :items="administrationsebenen"
           item-value="value"
           item-text="title"
-          multiple
           :no-data-text="$t('noDataFound')"
-          :placeholder="isEditActive ? $t('admin.rolle.selectMerkmale') : '---'"
+          :placeholder="$t('admin.administrationsebene.assignAdministrationsebene')"
+          ref="administrationsebene-select"
+          required="true"
           variant="outlined"
-          v-bind="selectedMerkmaleProps"
-          v-model="selectedMerkmale"
+          v-bind="selectedAdministrationsebeneProps"
+          v-model="selectedAdministrationsebene"
         ></v-select>
       </FormRow>
 
-      <!-- 5. Angebote zuordnen -->
+      <!-- 2. Rollenart zuordnen -->
       <v-row>
-        <h3 class="headline-3">5. {{ $t('admin.serviceProvider.assignServiceProvider') }}</h3>
+        <h3 class="headline-3">2. {{ $t('admin.rolle.assignRollenart') }}</h3>
       </v-row>
       <FormRow
-        :errorLabel="selectedServiceProvidersProps?.error || ''"
-        labelForId="service-provider-select"
-        :label="$t('admin.serviceProvider.serviceProvider')"
+        :errorLabel="selectedRollenArtProps?.error || ''"
+        labelForId="rollenart-select"
+        :isRequired="true"
+        :label="$t('admin.rolle.rollenart')"
       >
-        <v-autocomplete
-          autocomplete="off"
-          chips
+        <v-select
           clearable
-          data-testid="service-provider-select"
+          data-testid="rollenart-select"
           density="compact"
-          :disabled="!isEditActive"
-          id="service-provider-select"
-          ref="service-provider-select"
-          :items="serviceProviders"
+          :disabled="readonly"
+          id="rollenart-select"
+          :items="translatedRollenarten"
           item-value="value"
           item-text="title"
-          multiple
           :no-data-text="$t('noDataFound')"
-          :placeholder="isEditActive ? $t('admin.serviceProvider.selectServiceProvider') : '---'"
+          :placeholder="$t('admin.rolle.selectRollenart')"
+          ref="rollenart-select"
+          required="true"
           variant="outlined"
-          v-bind="selectedServiceProvidersProps"
-          v-model="selectedServiceProviders"
-        ></v-autocomplete>
+          v-bind="selectedRollenArtProps"
+          v-model="selectedRollenArt"
+        ></v-select>
       </FormRow>
 
-      <!-- 6. Systemrechte zuordnen -->
-      <v-row>
-        <h3 class="headline-3">6. {{ $t('admin.rolle.assignSystemrechte') }}</h3>
-      </v-row>
-      <!-- Iterate over each system right and create a checkbox for it -->
-      <FormRow
-        :errorLabel="selectedSystemRechteProps?.error || ''"
-        labelForId="systemrecht-select"
-        :label="$t('admin.rolle.systemrechte')"
-      >
-        <v-autocomplete
-          autocomplete="off"
-          chips
-          clearable
-          data-testid="systemrechte-select"
-          density="compact"
-          :disabled="!isEditActive"
-          id="systemrechte-select"
-          :items="translatedSystemrechte"
-          item-value="value"
-          item-text="title"
-          multiple
-          :no-data-text="$t('noDataFound')"
-          :placeholder="isEditActive ? $t('admin.rolle.selectSystemrechte') : '---'"
-          variant="outlined"
-          v-bind="selectedSystemRechteProps"
-          v-model="selectedSystemRechte"
-        ></v-autocomplete>
-      </FormRow>
+      <template v-if="selectedRollenArt && selectedAdministrationsebene">
+        <!-- 3. Rollenname eingeben -->
+        <v-row>
+          <h3 class="headline-3">3. {{ $t('admin.rolle.enterRollenname') }}</h3>
+        </v-row>
+        <FormRow
+          :errorLabel="selectedRollenNameProps?.error || ''"
+          labelForId="rollenname-input"
+          :isRequired="true"
+          :label="$t('admin.rolle.rollenname')"
+        >
+          <v-text-field
+            clearable
+            data-testid="rollenname-input"
+            density="compact"
+            :disabled="!isEditActive"
+            id="rollenname-input"
+            :placeholder="$t('admin.rolle.enterRollenname')"
+            ref="rollenname-input"
+            required="true"
+            variant="outlined"
+            v-bind="selectedRollenNameProps"
+            v-model="selectedRollenName"
+          ></v-text-field>
+        </FormRow>
+
+        <!-- 4. Merkmale zuordnen -->
+        <v-row>
+          <h3 class="headline-3">4. {{ $t('admin.rolle.assignMerkmale') }}</h3>
+        </v-row>
+        <FormRow
+          :errorLabel="selectedMerkmaleProps?.error || ''"
+          labelForId="merkmale-select"
+          :label="$t('admin.rolle.merkmale')"
+        >
+          <v-select
+            chips
+            clearable
+            data-testid="merkmale-select"
+            density="compact"
+            :disabled="!isEditActive"
+            id="merkmale-select"
+            :items="translatedMerkmale"
+            item-value="value"
+            item-text="title"
+            multiple
+            :no-data-text="$t('noDataFound')"
+            :placeholder="isEditActive ? $t('admin.rolle.selectMerkmale') : '---'"
+            variant="outlined"
+            v-bind="selectedMerkmaleProps"
+            v-model="selectedMerkmale"
+          ></v-select>
+        </FormRow>
+
+        <!-- 5. Angebote zuordnen -->
+        <v-row>
+          <h3 class="headline-3">5. {{ $t('admin.serviceProvider.assignServiceProvider') }}</h3>
+        </v-row>
+        <FormRow
+          :errorLabel="selectedServiceProvidersProps?.error || ''"
+          labelForId="service-provider-select"
+          :label="$t('admin.serviceProvider.serviceProvider')"
+        >
+          <v-autocomplete
+            autocomplete="off"
+            chips
+            clearable
+            data-testid="service-provider-select"
+            density="compact"
+            :disabled="!isEditActive"
+            id="service-provider-select"
+            ref="service-provider-select"
+            :items="serviceProviders"
+            item-value="value"
+            item-text="title"
+            multiple
+            :no-data-text="$t('noDataFound')"
+            :placeholder="isEditActive ? $t('admin.serviceProvider.selectServiceProvider') : '---'"
+            variant="outlined"
+            v-bind="selectedServiceProvidersProps"
+            v-model="selectedServiceProviders"
+          ></v-autocomplete>
+        </FormRow>
+
+        <!-- 6. Systemrechte zuordnen -->
+        <v-row>
+          <h3 class="headline-3">6. {{ $t('admin.rolle.assignSystemrechte') }}</h3>
+        </v-row>
+        <!-- Iterate over each system right and create a checkbox for it -->
+        <FormRow
+          :errorLabel="selectedSystemRechteProps?.error || ''"
+          labelForId="systemrecht-select"
+          :label="$t('admin.rolle.systemrechte')"
+        >
+          <v-autocomplete
+            autocomplete="off"
+            chips
+            clearable
+            data-testid="systemrechte-select"
+            density="compact"
+            :disabled="!isEditActive"
+            id="systemrechte-select"
+            :items="translatedSystemrechte"
+            item-value="value"
+            item-text="title"
+            multiple
+            :no-data-text="$t('noDataFound')"
+            :placeholder="isEditActive ? $t('admin.rolle.selectSystemrechte') : '---'"
+            variant="outlined"
+            v-bind="selectedSystemRechteProps"
+            v-model="selectedSystemRechte"
+          ></v-autocomplete>
+        </FormRow>
+      </template>
     </template>
   </FormWrapper>
 </template>
diff --git a/src/components/layout/TheFooter.vue b/src/components/layout/TheFooter.vue
index 24bac422c..76b439ec6 100644
--- a/src/components/layout/TheFooter.vue
+++ b/src/components/layout/TheFooter.vue
@@ -76,7 +76,7 @@
         <!-- Sponsor Logos -->
         <v-col
           cols="12"
-          lg="7"
+          lg="5"
           order-lg="2"
           class="sponsor-logos-col justify-end"
         >
@@ -106,7 +106,7 @@
         <!-- Footer Links -->
         <v-col
           cols="12"
-          lg="5"
+          lg="7"
           order-lg="1"
           class="footer-links-col justify-space-between"
         >
diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index c17b43ce6..eef75329c 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -74,6 +74,7 @@
       "addNew": "Neue Klasse hinzufügen",
       "assignKlasse": "Klasse zuordnen",
       "backToCreateKlasse": "Zurück zur Klassenanlage",
+      "backToEditKlasse": "Zurück zur Klassenbearbeitung",
       "create": "Klasse anlegen",
       "createAnother": "Weitere Klasse anlegen",
       "createNew": "Neue Klasse anlegen",
@@ -187,9 +188,10 @@
       "personalInfoSuccessDialogMessage": "Die Stammdaten wurden erfolgreich geändert.",
       "personalInfoSuccessDialogMessageWithUsername": "Die Stammdaten wurden erfolgreich geändert.\n\nDas Passwort wurde nicht verändert und kann wie zuvor verwendet werden. \n\nBitte teilen Sie der betroffenen Person die Stammdatenänderung (Benutzername, Mail-Adresse) mit. \n\nDie neuen Daten können Sie in der Gesamtübersicht einsehen." ,
       "printPassword": "Passwort drucken",
+      "resetPassword": "Passwort zurücksetzen",
       "resetPasswordConfirmation": "Sind Sie sicher, dass Sie das Passwort für {firstname} {lastname} zurücksetzen möchten?",
       "resetPasswordInformation": "Bitte teilen Sie dem Benutzer das temporäre Passwort mit. Nach dem Schließen des Dialogs wird es aus Sicherheitsgründen nicht mehr angezeigt.",
-      "resetPassword": "Passwort zurücksetzen",
+      "resetPasswordSuccessMessage": "Das Passwort wurde erfolgreich zurückgesetzt.",
       "rules": {
         "vorname": {
           "matches": "Der Vorname enthält ungültige Zeichen.",
diff --git a/src/views/admin/KlasseCreationView.spec.ts b/src/views/admin/KlasseCreationView.spec.ts
index e2ed04d21..28add760d 100644
--- a/src/views/admin/KlasseCreationView.spec.ts
+++ b/src/views/admin/KlasseCreationView.spec.ts
@@ -268,12 +268,4 @@ describe('KlasseCreationView', () => {
     wrapper?.find('[data-testid="alert-button"]').trigger('click');
     await nextTick();
   });
-
-  test('shows error message if REQUIRED_STEP_UP_LEVEL_NOT_MET error is present and click x button', async () => {
-    organisationStore.errorCode = 'REQUIRED_STEP_UP_LEVEL_NOT_MET';
-    await nextTick();
-    expect(wrapper?.find('[data-testid="alert-title"]').isVisible()).toBe(true);
-    wrapper?.find('[data-testid="close-layout-card-button"]').trigger('click');
-    await nextTick();
-  });
 });
diff --git a/src/views/admin/KlasseCreationView.vue b/src/views/admin/KlasseCreationView.vue
index 8e7ac0f24..fff2af00b 100644
--- a/src/views/admin/KlasseCreationView.vue
+++ b/src/views/admin/KlasseCreationView.vue
@@ -130,6 +130,7 @@
 
   function handleConfirmUnsavedChanges(): void {
     blockedNext();
+    organisationStore.errorCode = '';
   }
 
   const onSubmit: (e?: Event | undefined) => Promise<Promise<void> | undefined> = handleSubmit(async () => {
@@ -169,27 +170,16 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!organisationStore.errorCode"
       @onCloseClicked="navigateToKlasseManagement"
       :header="$t('admin.klasse.addNew')"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display if error on submit -->
-      <SpshAlert
-        :model-value="!!organisationStore.errorCode"
-        :title="$t('admin.klasse.klasseCreateErrorTitle')"
-        :type="'error'"
-        :closable="false"
-        :text="organisationStore.errorCode ? $t(`admin.klasse.errors.${organisationStore.errorCode}`) : ''"
-        :showButton="true"
-        :buttonText="$t('admin.klasse.backToCreateKlasse')"
-        :buttonAction="navigateBackToKlasseForm"
-      />
-
       <!-- The form to create a new Klasse -->
-      <template v-if="!organisationStore.createdKlasse && !organisationStore.errorCode">
+      <template v-if="!organisationStore.createdKlasse">
         <KlasseForm
+          :errorCode="organisationStore.errorCode"
           :schulen="schulen"
           :isEditActive="true"
           :isLoading="organisationStore.loading"
@@ -204,7 +194,19 @@
           ref="klasse-creation-form"
           v-model:selectedSchule="selectedSchule"
           v-model:selectedKlassenname="selectedKlassenname"
-        />
+        >
+          <!-- Error Message Display if error on submit -->
+          <SpshAlert
+            :model-value="!!organisationStore.errorCode"
+            :title="$t('admin.klasse.klasseCreateErrorTitle')"
+            :type="'error'"
+            :closable="false"
+            :text="organisationStore.errorCode ? $t(`admin.klasse.errors.${organisationStore.errorCode}`) : ''"
+            :showButton="true"
+            :buttonText="$t('admin.klasse.backToCreateKlasse')"
+            :buttonAction="navigateBackToKlasseForm"
+          />
+        </KlasseForm>
       </template>
 
       <!-- Result template on success after submit -->
diff --git a/src/views/admin/KlasseDetailsView.spec.ts b/src/views/admin/KlasseDetailsView.spec.ts
index a5ef9fb81..32941b270 100644
--- a/src/views/admin/KlasseDetailsView.spec.ts
+++ b/src/views/admin/KlasseDetailsView.spec.ts
@@ -165,5 +165,7 @@ describe('KlassenDetailsView', () => {
     expect(spshAlertWrapper?.props()).toMatchObject({
       title: 'Geänderte Daten',
     });
+    // reset errorCode after test
+    organisationStore.errorCode = '';
   });
 });
diff --git a/src/views/admin/KlasseDetailsView.vue b/src/views/admin/KlasseDetailsView.vue
index 93380c388..df767d40c 100644
--- a/src/views/admin/KlasseDetailsView.vue
+++ b/src/views/admin/KlasseDetailsView.vue
@@ -83,6 +83,7 @@
     isEditActive.value = false;
     showUnsavedChangesDialog.value = false;
     blockedNext();
+    organisationStore.errorCode = '';
   }
 
   function activateEditing(): void {
@@ -137,11 +138,15 @@
   }
 
   const alertButtonText: ComputedRef<string> = computed(() => {
-    return organisationStore.errorCode === 'NEWER_VERSION_ORGANISATION' ? t('refreshData') : t('nav.backToList');
+    return organisationStore.errorCode === 'NEWER_VERSION_ORGANISATION'
+      ? t('refreshData')
+      : isEditActive.value
+        ? t('admin.klasse.backToEditKlasse')
+        : t('nav.backToList');
   });
 
   const alertButtonAction: ComputedRef<() => void> = computed(() => {
-    return organisationStore.errorCode === 'NEWER_VERSION_ORGANISATION'
+    return organisationStore.errorCode === 'NEWER_VERSION_ORGANISATION' || isEditActive.value
       ? (): void => router.go(0)
       : navigateToKlasseManagement;
   });
@@ -190,38 +195,18 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!organisationStore.errorCode"
       data-testid="klasse-details-card"
       :header="$t('admin.klasse.edit')"
       @onCloseClicked="navigateToKlasseManagement"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display -->
-      <SpshAlert
-        :model-value="!!organisationStore.errorCode"
-        :title="
-          organisationStore.errorCode === 'UNSPECIFIED_ERROR'
-            ? $t('admin.klasse.loadingErrorTitle')
-            : $t(`admin.klasse.title.${organisationStore.errorCode}`)
-        "
-        :type="'error'"
-        :closable="false"
-        :text="
-          organisationStore.errorCode === 'UNSPECIFIED_ERROR'
-            ? $t('admin.klasse.loadingErrorText')
-            : $t(`admin.klasse.errors.${organisationStore.errorCode}`)
-        "
-        :showButton="true"
-        :buttonText="alertButtonText"
-        :buttonAction="alertButtonAction"
-        @update:modelValue="handleAlertClose"
-      />
-
-      <template v-if="!organisationStore.updatedOrganisation && !organisationStore.errorCode">
+      <template v-if="!organisationStore.updatedOrganisation">
         <v-container>
           <div v-if="organisationStore.currentOrganisation">
             <KlasseForm
+              :errorCode="organisationStore.errorCode"
               :isEditActive="isEditActive"
               :isLoading="organisationStore.loading"
               :readonly="true"
@@ -235,15 +220,36 @@
               ref="klasse-creation-form"
               v-model:selectedSchule="selectedSchule"
               v-model:selectedKlassenname="selectedKlassenname"
-            />
+            >
+              <!-- Error Message Display -->
+              <SpshAlert
+                :model-value="!!organisationStore.errorCode"
+                :title="
+                  organisationStore.errorCode === 'UNSPECIFIED_ERROR'
+                    ? $t('admin.klasse.loadingErrorTitle')
+                    : $t(`admin.klasse.title.${organisationStore.errorCode}`)
+                "
+                :type="'error'"
+                :closable="false"
+                :text="
+                  organisationStore.errorCode === 'UNSPECIFIED_ERROR'
+                    ? $t('admin.klasse.loadingErrorText')
+                    : $t(`admin.klasse.errors.${organisationStore.errorCode}`)
+                "
+                :showButton="true"
+                :buttonText="alertButtonText"
+                :buttonAction="alertButtonAction"
+                @update:modelValue="handleAlertClose"
+              />
+            </KlasseForm>
             <v-divider
-              v-if="isEditActive"
+              v-if="isEditActive && !organisationStore.errorCode"
               class="border-opacity-100 rounded"
               color="#E5EAEF"
               thickness="5px"
             ></v-divider>
             <div
-              v-if="!isEditActive"
+              v-if="!isEditActive && !organisationStore.errorCode"
               class="d-flex justify-sm-end"
             >
               <v-row class="pt-3 px-2 justify-end">
@@ -283,7 +289,7 @@
               </v-row>
             </div>
             <div
-              v-else
+              v-else-if="!organisationStore.errorCode"
               class="d-flex justify-end"
             >
               <v-row class="pt-3 px-2 save-cancel-row justify-end">
diff --git a/src/views/admin/PersonCreationView.spec.ts b/src/views/admin/PersonCreationView.spec.ts
index d819f7154..8a8e1e5e2 100644
--- a/src/views/admin/PersonCreationView.spec.ts
+++ b/src/views/admin/PersonCreationView.spec.ts
@@ -229,12 +229,4 @@ describe('PersonCreationView', () => {
     wrapper?.find('[data-testid="alert-button"]').trigger('click');
     await nextTick();
   });
-
-  test('shows error message if REQUIRED_STEP_UP_LEVEL_NOT_MET error is present and click x button', async () => {
-    personenkontextStore.errorCode = 'REQUIRED_STEP_UP_LEVEL_NOT_MET';
-    await nextTick();
-    expect(wrapper?.find('[data-testid="alert-title"]').isVisible()).toBe(true);
-    wrapper?.find('[data-testid="close-layout-card-button"]').trigger('click');
-    await nextTick();
-  });
 });
diff --git a/src/views/admin/PersonCreationView.vue b/src/views/admin/PersonCreationView.vue
index 4bf575160..45667e9e8 100644
--- a/src/views/admin/PersonCreationView.vue
+++ b/src/views/admin/PersonCreationView.vue
@@ -371,6 +371,8 @@
 
   function handleConfirmUnsavedChanges(): void {
     blockedNext();
+    personStore.errorCode = '';
+    personenkontextStore.errorCode = '';
   }
 
   function preventNavigation(event: BeforeUnloadEvent): void {
@@ -412,47 +414,20 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!personenkontextStore.errorCode && !personStore.errorCode"
       :header="$t('admin.person.addNew')"
       @onCloseClicked="navigateToPersonTable"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display for error messages from the personStore -->
-      <SpshAlert
-        :model-value="!!personStore.errorCode"
-        :title="$t('admin.person.creationErrorTitle')"
-        :type="'error'"
-        :closable="false"
-        :showButton="true"
-        :buttonText="$t('admin.person.backToCreatePerson')"
-        :buttonAction="navigateBackToPersonForm"
-        :text="creationErrorText"
-      />
-
-      <!-- Error Message Display for error messages from the personenkontextStore -->
-      <SpshAlert
-        :model-value="!!personenkontextStore.errorCode"
-        :type="'error'"
-        :closable="false"
-        :text="t(`admin.personenkontext.errors.${personenkontextStore.errorCode}`)"
-        :showButton="true"
-        :buttonText="$t('admin.person.backToCreatePerson')"
-        :buttonAction="navigateBackToPersonForm"
-        :title="t(`admin.personenkontext.title.${personenkontextStore.errorCode}`)"
-      />
-
       <!-- The form to create a new Person  -->
-      <template
-        v-if="
-          !personenkontextStore.createdPersonWithKontext && !personStore.errorCode && !personenkontextStore.errorCode
-        "
-      >
+      <template v-if="!personenkontextStore.createdPersonWithKontext">
         <FormWrapper
           :canCommit="canCommit"
           :confirmUnsavedChangesAction="handleConfirmUnsavedChanges"
           :createButtonLabel="$t('admin.person.create')"
           :discardButtonLabel="$t('admin.person.discard')"
+          :hideActions="!!personenkontextStore.errorCode || !!personStore.errorCode"
           id="person-creation-form"
           :isLoading="personenkontextStore.loading"
           :onDiscard="navigateToPersonTable"
@@ -460,90 +435,116 @@
           :onSubmit="onSubmit"
           :showUnsavedChangesDialog="showUnsavedChangesDialog"
         >
-          <!-- Organisation, Rolle, Klasse zuordnen -->
-          <PersonenkontextCreate
-            :showHeadline="true"
-            :organisationen="organisationen"
-            ref="personenkontext-create"
-            :rollen="rollen"
-            :klassen="klassen"
-            :selectedOrganisationProps="selectedOrganisationProps"
-            :selectedRolleProps="selectedRolleProps"
-            :selectedKlasseProps="selectedKlasseProps"
-            :befristungInputProps="{
-              befristungProps: selectedBefristungProps,
-              befristungOptionProps: selectedBefristungOptionProps,
-              isUnbefristetDisabled: isUnbefristetButtonDisabled,
-              isBefristungRequired: isBefristungspflichtRolle(selectedRolle),
-              nextSchuljahresende: getNextSchuljahresende(),
-              befristung: selectedBefristung,
-              befristungOption: selectedBefristungOption,
-            }"
-            v-model:selectedOrganisation="selectedOrganisation"
-            v-model:selectedRolle="selectedRolle"
-            v-model:selectedKlasse="selectedKlasse"
-            @update:selectedOrganisation="(value?: string) => (selectedOrganisation = value)"
-            @update:selectedRolle="(value?: string) => (selectedRolle = value)"
-            @update:selectedKlasse="(value?: string) => (selectedKlasse = value)"
-            @update:canCommit="canCommit = $event"
-            @update:befristung="handleBefristungUpdate"
-            @update:calculatedBefristungOption="handleBefristungOptionUpdate"
-            @fieldReset="handleFieldReset"
+          <!-- Error Message Display for error messages from the personenkontextStore -->
+          <SpshAlert
+            :model-value="!!personenkontextStore.errorCode"
+            :type="'error'"
+            :closable="false"
+            :text="t(`admin.personenkontext.errors.${personenkontextStore.errorCode}`)"
+            :showButton="true"
+            :buttonText="$t('admin.person.backToCreatePerson')"
+            :buttonAction="navigateBackToPersonForm"
+            :title="t(`admin.personenkontext.title.${personenkontextStore.errorCode}`)"
           />
-          <div v-if="selectedOrganisation">
-            <v-row>
-              <h3 class="headline-3">4. {{ $t('admin.person.personalInfo') }}</h3>
-            </v-row>
-            <!-- Vorname -->
-            <FormRow
-              :errorLabel="selectedVornameProps['error']"
-              labelForId="vorname-input"
-              :isRequired="true"
-              :label="$t('person.firstName')"
-            >
-              <v-text-field
-                clearable
-                data-testid="vorname-input"
-                density="compact"
-                id="vorname-input"
-                ref="vorname-input"
-                :placeholder="$t('person.enterFirstName')"
-                required="true"
-                variant="outlined"
-                v-bind="selectedVornameProps"
-                v-model="selectedVorname"
-              ></v-text-field>
-            </FormRow>
-
-            <!-- Nachname -->
-            <FormRow
-              :errorLabel="selectedFamiliennameProps['error']"
-              labelForId="familienname-input"
-              :isRequired="true"
-              :label="$t('person.lastName')"
-            >
-              <v-text-field
-                clearable
-                data-testid="familienname-input"
-                density="compact"
-                id="familienname-input"
-                ref="familienname-input"
-                :placeholder="$t('person.enterLastName')"
-                required="true"
-                variant="outlined"
-                v-bind="selectedFamiliennameProps"
-                v-model="selectedFamilienname"
-              ></v-text-field>
-            </FormRow>
-            <KopersInput
-              v-if="isKopersRolle(selectedRolle) && selectedOrganisation"
-              :hasNoKopersNr="hasNoKopersNr"
-              v-model:selectedKopersNr="selectedKopersNr"
-              :selectedKopersNrProps="selectedKopersNrProps"
-              @update:selectedKopersNr="(value?: string | null) => (selectedKopersNr = value)"
-              @update:hasNoKopersNr="(value: boolean | undefined) => (hasNoKopersNr = value)"
-            ></KopersInput>
-          </div>
+
+          <!-- Error Message Display for error messages from the personStore -->
+          <SpshAlert
+            :model-value="!!personStore.errorCode"
+            :title="$t('admin.person.creationErrorTitle')"
+            :type="'error'"
+            :closable="false"
+            :showButton="true"
+            :buttonText="$t('admin.person.backToCreatePerson')"
+            :buttonAction="navigateBackToPersonForm"
+            :text="creationErrorText"
+          />
+
+          <template v-if="!personenkontextStore.errorCode && !personStore.errorCode">
+            <!-- Organisation, Rolle, Klasse zuordnen -->
+            <PersonenkontextCreate
+              :showHeadline="true"
+              :organisationen="organisationen"
+              ref="personenkontext-create"
+              :rollen="rollen"
+              :klassen="klassen"
+              :selectedOrganisationProps="selectedOrganisationProps"
+              :selectedRolleProps="selectedRolleProps"
+              :selectedKlasseProps="selectedKlasseProps"
+              :befristungInputProps="{
+                befristungProps: selectedBefristungProps,
+                befristungOptionProps: selectedBefristungOptionProps,
+                isUnbefristetDisabled: isUnbefristetButtonDisabled,
+                isBefristungRequired: isBefristungspflichtRolle(selectedRolle),
+                nextSchuljahresende: getNextSchuljahresende(),
+                befristung: selectedBefristung,
+                befristungOption: selectedBefristungOption,
+              }"
+              v-model:selectedOrganisation="selectedOrganisation"
+              v-model:selectedRolle="selectedRolle"
+              v-model:selectedKlasse="selectedKlasse"
+              @update:selectedOrganisation="(value?: string) => (selectedOrganisation = value)"
+              @update:selectedRolle="(value?: string) => (selectedRolle = value)"
+              @update:selectedKlasse="(value?: string) => (selectedKlasse = value)"
+              @update:canCommit="canCommit = $event"
+              @update:befristung="handleBefristungUpdate"
+              @update:calculatedBefristungOption="handleBefristungOptionUpdate"
+              @fieldReset="handleFieldReset"
+            />
+            <div v-if="selectedOrganisation">
+              <v-row>
+                <h3 class="headline-3">4. {{ $t('admin.person.personalInfo') }}</h3>
+              </v-row>
+              <!-- Vorname -->
+              <FormRow
+                :errorLabel="selectedVornameProps['error']"
+                labelForId="vorname-input"
+                :isRequired="true"
+                :label="$t('person.firstName')"
+              >
+                <v-text-field
+                  clearable
+                  data-testid="vorname-input"
+                  density="compact"
+                  id="vorname-input"
+                  ref="vorname-input"
+                  :placeholder="$t('person.enterFirstName')"
+                  required="true"
+                  variant="outlined"
+                  v-bind="selectedVornameProps"
+                  v-model="selectedVorname"
+                ></v-text-field>
+              </FormRow>
+
+              <!-- Nachname -->
+              <FormRow
+                :errorLabel="selectedFamiliennameProps['error']"
+                labelForId="familienname-input"
+                :isRequired="true"
+                :label="$t('person.lastName')"
+              >
+                <v-text-field
+                  clearable
+                  data-testid="familienname-input"
+                  density="compact"
+                  id="familienname-input"
+                  ref="familienname-input"
+                  :placeholder="$t('person.enterLastName')"
+                  required="true"
+                  variant="outlined"
+                  v-bind="selectedFamiliennameProps"
+                  v-model="selectedFamilienname"
+                ></v-text-field>
+              </FormRow>
+              <KopersInput
+                v-if="isKopersRolle(selectedRolle) && selectedOrganisation"
+                :hasNoKopersNr="hasNoKopersNr"
+                v-model:selectedKopersNr="selectedKopersNr"
+                :selectedKopersNrProps="selectedKopersNrProps"
+                @update:selectedKopersNr="(value?: string | null) => (selectedKopersNr = value)"
+                @update:hasNoKopersNr="(value: boolean | undefined) => (hasNoKopersNr = value)"
+              ></KopersInput>
+            </div>
+          </template>
         </FormWrapper>
       </template>
 
diff --git a/src/views/admin/PersonDetailsView.vue b/src/views/admin/PersonDetailsView.vue
index 5f15603e8..1cfa67982 100644
--- a/src/views/admin/PersonDetailsView.vue
+++ b/src/views/admin/PersonDetailsView.vue
@@ -1131,7 +1131,9 @@
       }
       changePersonMetadataSuccessMessage.value = t('admin.person.personalInfoSuccessDialogMessageWithUsername');
       changePersonMetadataSuccessVisible.value = !personStore.errorCode;
-      resetFormChangePersonMetadata();
+      if (!personStore.errorCode) {
+        resetFormChangePersonMetadata();
+      }
     });
 
   // Checks for dirtiness depending on the active form
@@ -1315,38 +1317,45 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!personStore.errorCode && !personenkontextStore.errorCode"
       data-testid="person-details-card"
       :header="$t('admin.person.edit')"
       @onCloseClicked="navigateToPersonTable"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display if the personStore throws any kind of error (Not being able to load the person) -->
-      <SpshAlert
-        :model-value="!!personStore.errorCode"
-        :type="'error'"
-        :closable="false"
-        :text="$t(`admin.person.errors.${personStore.errorCode}`)"
-        :showButton="true"
-        :buttonText="alertButtonTextKopers"
-        :buttonAction="alertButtonActionKopers"
-        :title="$t(`admin.person.title.${personStore.errorCode}`)"
-        @update:modelValue="handleAlertClose"
-      />
-
-      <!-- Error Message Display if the personenkontextStore throws any kind of error (Not being able to load the kontext) -->
-      <SpshAlert
-        :model-value="!!personenkontextStore.errorCode"
-        :type="'error'"
-        :closable="false"
-        :text="creationErrorText"
-        :showButton="true"
-        :buttonText="alertButtonText"
-        :buttonAction="alertButtonAction"
-        :title="creationErrorTitle"
-        @update:modelValue="handleAlertClose"
-      />
+      <v-container
+        v-if="!!personStore.errorCode || !!personenkontextStore.errorCode"
+        class="px-3 px-sm-16"
+      >
+        <v-container class="px-lg-16">
+          <!-- Error Message Display if the personStore throws any kind of error (Not being able to load the person) -->
+          <SpshAlert
+            :model-value="!!personStore.errorCode"
+            :type="'error'"
+            :closable="false"
+            :text="$t(`admin.person.errors.${personStore.errorCode}`)"
+            :showButton="true"
+            :buttonText="alertButtonTextKopers"
+            :buttonAction="alertButtonActionKopers"
+            :title="$t(`admin.person.title.${personStore.errorCode}`)"
+            @update:modelValue="handleAlertClose"
+          />
+
+          <!-- Error Message Display if the personenkontextStore throws any kind of error (Not being able to load the kontext) -->
+          <SpshAlert
+            :model-value="!!personenkontextStore.errorCode"
+            :type="'error'"
+            :closable="false"
+            :text="creationErrorText"
+            :showButton="true"
+            :buttonText="alertButtonText"
+            :buttonAction="alertButtonAction"
+            :title="creationErrorTitle"
+            @update:modelValue="handleAlertClose"
+          />
+        </v-container>
+      </v-container>
 
       <template v-if="!personStore.errorCode && !personenkontextStore.errorCode">
         <v-container class="personal-info">
@@ -2175,7 +2184,7 @@
               <template v-else>
                 <v-col>
                   <h3 class="subtitle-1">{{ $t('admin.person.twoFactorAuthentication.header') }}</h3>
-                  <v-row class="mt-4 mr-lg-13 text-body">
+                  <v-row class="mt-4 text-body">
                     <v-col
                       class="text-right"
                       cols="1"
diff --git a/src/views/admin/PersonImportView.vue b/src/views/admin/PersonImportView.vue
index 07f817355..bd9758bad 100644
--- a/src/views/admin/PersonImportView.vue
+++ b/src/views/admin/PersonImportView.vue
@@ -235,6 +235,7 @@
 
   function handleConfirmUnsavedChanges(): void {
     blockedNext();
+    importStore.errorCode = '';
   }
 
   function preventNavigation(event: BeforeUnloadEvent): void {
diff --git a/src/views/admin/SchuleCreationView.spec.ts b/src/views/admin/SchuleCreationView.spec.ts
index 0498840d3..a38cb5359 100644
--- a/src/views/admin/SchuleCreationView.spec.ts
+++ b/src/views/admin/SchuleCreationView.spec.ts
@@ -130,12 +130,4 @@ describe('SchuleCreationView', () => {
     wrapper?.find('[data-testid="alert-button"]').trigger('click');
     await nextTick();
   });
-
-  test('shows error message if REQUIRED_STEP_UP_LEVEL_NOT_MET error is present and click x button', async () => {
-    organisationStore.errorCode = 'REQUIRED_STEP_UP_LEVEL_NOT_MET';
-    await nextTick();
-    expect(wrapper?.find('[data-testid="alert-title"]').isVisible()).toBe(true);
-    wrapper?.find('[data-testid="close-layout-card-button"]').trigger('click');
-    await nextTick();
-  });
 });
diff --git a/src/views/admin/SchuleCreationView.vue b/src/views/admin/SchuleCreationView.vue
index 29bf4c75b..9130bd773 100644
--- a/src/views/admin/SchuleCreationView.vue
+++ b/src/views/admin/SchuleCreationView.vue
@@ -134,6 +134,7 @@
 
   function handleConfirmUnsavedChanges(): void {
     blockedNext();
+    organisationStore.errorCode = '';
   }
 
   async function navigateToSchuleManagement(): Promise<void> {
@@ -167,6 +168,7 @@
 
   onMounted(async () => {
     organisationStore.createdSchule = null;
+    organisationStore.errorCode = '';
     await organisationStore.getSchultraeger();
 
     if (schultraegerList.value && schultraegerList.value.length > 0) {
@@ -192,30 +194,19 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!organisationStore.errorCode"
       @onCloseClicked="navigateToSchuleManagement"
       :header="$t('admin.schule.addNew')"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display if error on submit -->
-      <SpshAlert
-        :model-value="!!organisationStore.errorCode"
-        :title="$t('admin.schule.schuleCreateErrorTitle')"
-        :type="'error'"
-        :closable="false"
-        :text="organisationStore.errorCode ? $t(`admin.schule.errors.${organisationStore.errorCode}`) : ''"
-        :showButton="true"
-        :buttonText="$t('admin.schule.backToCreateSchule')"
-        :buttonAction="navigateBackToSchuleForm"
-        buttonClass="primary"
-      />
       <!-- The form to create a new school (No created school yet and no errorCode) -->
-      <template v-if="!organisationStore.createdSchule && !organisationStore.errorCode">
+      <template v-if="!organisationStore.createdSchule">
         <FormWrapper
           :confirmUnsavedChangesAction="handleConfirmUnsavedChanges"
           :createButtonLabel="$t('admin.schule.create')"
           :discardButtonLabel="$t('admin.schule.discard')"
+          :hideActions="!!organisationStore.errorCode"
           id="schule-creation-form"
           :isLoading="organisationStore.loading"
           :onDiscard="navigateToSchuleManagement"
@@ -223,85 +214,100 @@
           :onSubmit="onSubmit"
           :showUnsavedChangesDialog="showUnsavedChangesDialog"
         >
-          <!-- Select school type. For now not bound to anything and just a UI element -->
-          <v-row>
-            <v-col>
-              <h3 class="headline-3">1. {{ $t('admin.schule.assignSchulform') }}</h3>
-            </v-col>
-          </v-row>
-          <v-row>
-            <v-col
-              cols="4"
-              class="d-none d-md-flex"
-            ></v-col>
-            <v-radio-group
-              inline
-              v-model="selectedSchulform"
-              data-testid="schulform-radio-group"
-            >
+          <!-- Error Message Display if error on submit -->
+          <SpshAlert
+            :model-value="!!organisationStore.errorCode"
+            :title="$t('admin.schule.schuleCreateErrorTitle')"
+            :type="'error'"
+            :closable="false"
+            :text="organisationStore.errorCode ? $t(`admin.schule.errors.${organisationStore.errorCode}`) : ''"
+            :showButton="true"
+            :buttonText="$t('admin.schule.backToCreateSchule')"
+            :buttonAction="navigateBackToSchuleForm"
+            buttonClass="primary"
+          />
+
+          <template v-if="!organisationStore.errorCode">
+            <!-- Select school type. For now not bound to anything and just a UI element -->
+            <v-row>
+              <v-col>
+                <h3 class="headline-3">1. {{ $t('admin.schule.assignSchulform') }}</h3>
+              </v-col>
+            </v-row>
+            <v-row>
               <v-col
-                v-for="(schultraeger, index) in schultraegerList"
-                :key="schultraeger.id"
-                offset-md="1"
-                cols="12"
-                sm="5"
-                class="pb-0"
+                cols="4"
+                class="d-none d-md-flex"
+              ></v-col>
+              <v-radio-group
+                inline
+                v-model="selectedSchulform"
+                data-testid="schulform-radio-group"
               >
-                <v-radio
-                  :label="schultraeger.name"
-                  :value="schultraeger.id"
-                  :data-testid="'schulform-radio-button-' + index"
-                ></v-radio>
+                <v-col
+                  v-for="(schultraeger, index) in schultraegerList"
+                  :key="schultraeger.id"
+                  offset-md="1"
+                  cols="12"
+                  sm="5"
+                  class="pb-0"
+                >
+                  <v-radio
+                    :label="schultraeger.name"
+                    :value="schultraeger.id"
+                    :data-testid="'schulform-radio-button-' + index"
+                  ></v-radio>
+                </v-col>
+              </v-radio-group>
+            </v-row>
+            <!-- Enter service number -->
+            <v-row>
+              <v-col>
+                <h3 class="headline-3">2. {{ $t('admin.schule.enterDienststellennummer') }}</h3>
               </v-col>
-            </v-radio-group>
-          </v-row>
-          <!-- Enter service number -->
-          <v-row>
-            <v-col>
-              <h3 class="headline-3">2. {{ $t('admin.schule.enterDienststellennummer') }}</h3>
-            </v-col>
-          </v-row>
-          <FormRow
-            :errorLabel="selectedDienststellennummerProps['error']"
-            labelForId="dienststellennummer-input"
-            :isRequired="true"
-            :label="$t('admin.schule.dienststellennummer')"
-          >
-            <v-text-field
-              clearable
-              data-testid="dienststellennummer-input"
-              v-bind="selectedDienststellennummerProps"
-              v-model="selectedDienststellennummer"
-              :placeholder="$t('admin.schule.dienststellennummer')"
-              ref="dienststellennummer-input"
-              variant="outlined"
-              density="compact"
-            ></v-text-field>
-          </FormRow>
-          <!-- select school name -->
-          <v-row>
-            <v-col>
-              <h3 class="headline-3">3. {{ $t('admin.schule.enterSchulname') }}</h3>
-            </v-col>
-          </v-row>
-          <FormRow
-            :errorLabel="selectedSchulnameProps['error']"
-            labelForId="schulname-input"
-            :isRequired="true"
-            :label="$t('admin.schule.schulname')"
-          >
-            <v-text-field
-              clearable
-              data-testid="schulname-input"
-              v-bind="selectedSchulnameProps"
-              v-model="selectedSchulname"
-              :placeholder="$t('admin.schule.schulname')"
-              ref="schulname-input"
-              variant="outlined"
-              density="compact"
-              required
-            ></v-text-field>
-          </FormRow>
+            </v-row>
+            <FormRow
+              :errorLabel="selectedDienststellennummerProps['error']"
+              labelForId="dienststellennummer-input"
+              :isRequired="true"
+              :label="$t('admin.schule.dienststellennummer')"
+            >
+              <v-text-field
+                clearable
+                data-testid="dienststellennummer-input"
+                v-bind="selectedDienststellennummerProps"
+                v-model="selectedDienststellennummer"
+                :placeholder="$t('admin.schule.dienststellennummer')"
+                ref="dienststellennummer-input"
+                variant="outlined"
+                density="compact"
+              ></v-text-field>
+            </FormRow>
+            <!-- select school name -->
+            <v-row>
+              <v-col>
+                <h3 class="headline-3">3. {{ $t('admin.schule.enterSchulname') }}</h3>
+              </v-col>
+            </v-row>
+            <FormRow
+              :errorLabel="selectedSchulnameProps['error']"
+              labelForId="schulname-input"
+              :isRequired="true"
+              :label="$t('admin.schule.schulname')"
+            >
+              <v-text-field
+                clearable
+                data-testid="schulname-input"
+                v-bind="selectedSchulnameProps"
+                v-model="selectedSchulname"
+                :placeholder="$t('admin.schule.schulname')"
+                ref="schulname-input"
+                variant="outlined"
+                density="compact"
+                required
+              ></v-text-field>
+            </FormRow>
+          </template>
         </FormWrapper>
       </template>
       <!-- Result template on success after submit (Present value in createdSchule and no errorCode)  -->
diff --git a/src/views/admin/rollen/RolleCreationView.spec.ts b/src/views/admin/rollen/RolleCreationView.spec.ts
index f39353cfa..53514ad6b 100644
--- a/src/views/admin/rollen/RolleCreationView.spec.ts
+++ b/src/views/admin/rollen/RolleCreationView.spec.ts
@@ -94,6 +94,8 @@ describe('RolleCreationView', () => {
     wrapper?.find('[data-testid="alert-button"]').trigger('click');
     await nextTick();
     expect(push).toHaveBeenCalledTimes(1);
+    // reset errorCode after test
+    rolleStore.errorCode = '';
   });
 
   test('it closes the view and navigates back to rolle table', async () => {
diff --git a/src/views/admin/rollen/RolleCreationView.vue b/src/views/admin/rollen/RolleCreationView.vue
index 1a9a3bb59..dc273cd98 100644
--- a/src/views/admin/rollen/RolleCreationView.vue
+++ b/src/views/admin/rollen/RolleCreationView.vue
@@ -98,6 +98,7 @@
 
   function handleConfirmUnsavedChanges(): void {
     blockedNext();
+    rolleStore.errorCode = '';
   }
 
   async function navigateBackToRolleForm(): Promise<void> {
@@ -278,28 +279,17 @@
       {{ $t('admin.headline') }}
     </h1>
     <LayoutCard
-      :closable="true"
+      :closable="!rolleStore.errorCode"
       @onCloseClicked="navigateToRolleManagement"
       :header="$t('admin.rolle.addNew')"
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display if error on submit -->
-      <SpshAlert
-        :model-value="!!rolleStore.errorCode"
-        :title="t('admin.rolle.rolleCreateErrorTitle')"
-        :type="'error'"
-        :closable="false"
-        :text="rolleStore.errorCode ? $t(`admin.rolle.errors.${rolleStore.errorCode}`) : ''"
-        :showButton="true"
-        :buttonText="$t('admin.rolle.backToCreateRolle')"
-        :buttonAction="navigateBackToRolleForm"
-      />
-
       <!-- The form to create a new Rolle -->
-      <template v-if="!rolleStore.createdRolle && !rolleStore.errorCode">
+      <template v-if="!rolleStore.createdRolle">
         <RolleForm
           :administrationsebenen="administrationsebenen"
+          :errorCode="rolleStore.errorCode"
           :onHandleConfirmUnsavedChanges="handleConfirmUnsavedChanges"
           :onHandleDiscard="navigateToRolleManagement"
           :onShowDialogChange="(value?: boolean) => (showUnsavedChangesDialog = value || false)"
@@ -324,7 +314,20 @@
           :translatedRollenarten="translatedRollenarten"
           :translatedMerkmale="translatedMerkmale"
           :translatedSystemrechte="translatedSystemrechte"
-        ></RolleForm>
+        >
+          <!-- Error Message Display if error on submit -->
+          <!-- To trigger unsaved changes dialog the alert has to be inside the form wrapper -->
+          <SpshAlert
+            :model-value="!!rolleStore.errorCode"
+            :title="t('admin.rolle.rolleCreateErrorTitle')"
+            :type="'error'"
+            :closable="false"
+            :text="rolleStore.errorCode ? $t(`admin.rolle.errors.${rolleStore.errorCode}`) : ''"
+            :showButton="true"
+            :buttonText="$t('admin.rolle.backToCreateRolle')"
+            :buttonAction="navigateBackToRolleForm"
+          />
+        </RolleForm>
       </template>
 
       <!-- Result template on success after submit  -->
diff --git a/src/views/admin/rollen/RolleDetailsView.spec.ts b/src/views/admin/rollen/RolleDetailsView.spec.ts
index 57e87ce06..8126dba57 100644
--- a/src/views/admin/rollen/RolleDetailsView.spec.ts
+++ b/src/views/admin/rollen/RolleDetailsView.spec.ts
@@ -70,7 +70,7 @@ beforeEach(async () => {
 });
 
 describe('RolleDetailsView', () => {
-  test('it renders the role details view', () => {
+  test('it renders the rolle details view', () => {
     expect(wrapper?.find('[data-testid="rolle-details-card"]').isVisible()).toBe(true);
   });
 
@@ -145,6 +145,9 @@ describe('RolleDetailsView', () => {
   });
 
   test('displays error message correctly', async () => {
+    // We have to reset updatedRolle to null to trigger the error message
+    rolleStore.updatedRolle = null;
+
     // Test case 1: ROLLE_UPDATE_ERROR
     rolleStore.errorCode = 'ROLLE_UPDATE_ERROR';
     await nextTick();
@@ -160,5 +163,7 @@ describe('RolleDetailsView', () => {
     expect(spshAlertWrapper?.props()).toMatchObject({
       title: 'Geänderte Daten',
     });
+    // reset errorCode after test
+    rolleStore.errorCode = '';
   });
 });
diff --git a/src/views/admin/rollen/RolleDetailsView.vue b/src/views/admin/rollen/RolleDetailsView.vue
index 39320e8fc..8f039b4f1 100644
--- a/src/views/admin/rollen/RolleDetailsView.vue
+++ b/src/views/admin/rollen/RolleDetailsView.vue
@@ -142,6 +142,7 @@
     isEditActive.value = false;
     showUnsavedChangesDialog.value = false;
     blockedNext();
+    rolleStore.errorCode = '';
   }
 
   const onSubmit: (e?: Event | undefined) => Promise<Promise<void> | undefined> = formContext.handleSubmit(async () => {
@@ -331,28 +332,7 @@
       :padded="true"
       :showCloseText="true"
     >
-      <!-- Error Message Display -->
-      <SpshAlert
-        :model-value="!!rolleStore.errorCode"
-        :title="
-          organisationStore.errorCode === 'UNSPECIFIED_ERROR'
-            ? $t('admin.rolle.loadingErrorTitle')
-            : $t(`admin.rolle.title.${rolleStore.errorCode}`)
-        "
-        :type="'error'"
-        :closable="false"
-        :text="
-          rolleStore.errorCode === 'UNSPECIFIED_ERROR'
-            ? $t('admin.rolle.loadingErrorText')
-            : $t(`admin.rolle.errors.${rolleStore.errorCode}`)
-        "
-        :showButton="true"
-        :buttonText="alertButtonText"
-        :buttonAction="alertButtonAction"
-        @update:modelValue="handleAlertClose"
-      />
-
-      <template v-if="!rolleStore.updatedRolle && !rolleStore.errorCode">
+      <template v-if="!rolleStore.updatedRolle">
         <v-container>
           <div v-if="rolleStore.currentRolle">
             <RolleForm
@@ -380,7 +360,28 @@
               :translatedMerkmale="allMerkmale"
               :translatedSystemrechte="allSystemrechte"
               :showUnsavedChangesDialog="showUnsavedChangesDialog"
-            ></RolleForm>
+            >
+              <!-- Error Message Display -->
+              <SpshAlert
+                :model-value="!!rolleStore.errorCode"
+                :title="
+                  organisationStore.errorCode === 'UNSPECIFIED_ERROR'
+                    ? $t('admin.rolle.loadingErrorTitle')
+                    : $t(`admin.rolle.title.${rolleStore.errorCode}`)
+                "
+                :type="'error'"
+                :closable="false"
+                :text="
+                  rolleStore.errorCode === 'UNSPECIFIED_ERROR'
+                    ? $t('admin.rolle.loadingErrorText')
+                    : $t(`admin.rolle.errors.${rolleStore.errorCode}`)
+                "
+                :showButton="true"
+                :buttonText="alertButtonText"
+                :buttonAction="alertButtonAction"
+                @update:modelValue="handleAlertClose"
+              />
+            </RolleForm>
             <v-divider
               v-if="isEditActive"
               class="border-opacity-100 rounded"