diff --git a/console/src/app/app-routing.module.ts b/console/src/app/app-routing.module.ts
index 13da07dc9e..b336e0b640 100644
--- a/console/src/app/app-routing.module.ts
+++ b/console/src/app/app-routing.module.ts
@@ -166,7 +166,7 @@ const routes: Routes = [
     loadChildren: () => import('./pages/org-settings/org-settings.module').then((m) => m.OrgSettingsModule),
     canActivate: [AuthGuard, RoleGuard],
     data: {
-      roles: ['iam.read', 'iam.write'],
+      roles: ['org.read', 'org.write'],
     },
   },
   {
diff --git a/console/src/app/app.module.ts b/console/src/app/app.module.ts
index f0af3b14ef..71e7a1b644 100644
--- a/console/src/app/app.module.ts
+++ b/console/src/app/app.module.ts
@@ -50,6 +50,7 @@ import {
 import { StatehandlerService, StatehandlerServiceImpl } from './services/statehandler/statehandler.service';
 import { StorageService } from './services/storage.service';
 import { ThemeService } from './services/theme.service';
+import { ToastService } from './services/toast.service';
 
 registerLocaleData(localeDe);
 
@@ -175,6 +176,7 @@ const authConfig: AuthConfig = {
     AdminService,
     KeyboardShortcutsService,
     AssetService,
+    ToastService,
     NavigationService,
     { provide: 'windowObject', useValue: window },
   ],
diff --git a/console/src/app/modules/idp-table/idp-table.component.html b/console/src/app/modules/idp-table/idp-table.component.html
index 1ac669759b..bfa88fbc7b 100644
--- a/console/src/app/modules/idp-table/idp-table.component.html
+++ b/console/src/app/modules/idp-table/idp-table.component.html
@@ -248,6 +248,12 @@
       <tr class="highlight" mat-row *matRowDef="let row; columns: displayedColumns"></tr>
     </table>
   </div>
+
+  <div *ngIf="(loading$ | async) === false && !dataSource?.data?.length" class="no-content-row">
+    <i class="las la-exclamation"></i>
+    <span>{{ 'IDP.EMPTY' | translate }}</span>
+  </div>
+
   <cnsl-paginator
     #paginator
     class="paginator"
diff --git a/console/src/app/modules/org-context/org-context.component.html b/console/src/app/modules/org-context/org-context.component.html
index be108c82e5..c0b60781b4 100644
--- a/console/src/app/modules/org-context/org-context.component.html
+++ b/console/src/app/modules/org-context/org-context.component.html
@@ -49,9 +49,11 @@
     </ng-container>
   </div>
 
-  <button mat-button class="show-all" [routerLink]="['/orgs']" (click)="closedCard.emit()">
-    {{ 'MENU.SHOWORGS' | translate }}
-  </button>
+  <ng-template cnslHasRole [hasRole]="['iam.read']">
+    <button mat-button class="show-all" [routerLink]="['/orgs']" (click)="closedCard.emit()">
+      {{ 'MENU.SHOWORGS' | translate }}
+    </button>
+  </ng-template>
 
   <ng-template cnslHasRole [hasRole]="['org.create', 'iam.write']">
     <button mat-button [routerLink]="['/org/create']" (click)="closedCard.emit()">
diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.html b/console/src/app/modules/policies/login-policy/login-policy.component.html
index 2e52e020e2..d717aa68d1 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.html
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.html
@@ -4,7 +4,26 @@
   <mat-spinner diameter="30" *ngIf="loading" color="primary"></mat-spinner>
 </div>
 
-<h2>{{ 'MFA.LIST.MULTIFACTORTITLE' | translate }}</h2>
+<h2>{{ 'SETTINGS.LIST.LOGIN' | translate }}</h2>
+
+<ng-container *ngIf="serviceType === PolicyComponentServiceType.MGMT && !isDefault">
+  <ng-template cnslHasRole [hasRole]="['policy.delete']">
+    <button
+      color="primary"
+      class="loginpolicy-reset-button"
+      matTooltip="{{ 'POLICY.RESET' | translate }}"
+      color="warn"
+      (click)="removePolicy()"
+      mat-stroked-button
+    >
+      {{ 'POLICY.RESET' | translate }}
+    </button>
+  </ng-template>
+</ng-container>
+
+<br />
+
+<h3>{{ 'MFA.LIST.MULTIFACTORTITLE' | translate }}</h3>
 <p class="cnsl-secondary-text">{{ 'MFA.LIST.MULTIFACTORDESCRIPTION' | translate }}</p>
 
 <div class="login-policy-row" *ngIf="loginData">
@@ -41,7 +60,7 @@
 
 <br />
 
-<h2>{{ 'MFA.LIST.SECONDFACTORTITLE' | translate }}</h2>
+<h3>{{ 'MFA.LIST.SECONDFACTORTITLE' | translate }}</h3>
 <p class="cnsl-secondary-text">{{ 'MFA.LIST.SECONDFACTORDESCRIPTION' | translate }}</p>
 
 <div *ngIf="loginData" class="login-policy-row">
@@ -71,7 +90,7 @@
 
 <br />
 
-<h2>{{ 'POLICY.LOGIN_POLICY.LIFETIMEDURATIONS' | translate }}</h2>
+<h3>{{ 'POLICY.LOGIN_POLICY.LIFETIMEDURATIONS' | translate }}</h3>
 
 <form class="lifetime-form" (ngSubmit)="savePolicy()" [formGroup]="lifetimeForm" autocomplete="off">
   <cnsl-form-field class="lifetime-form-field" label="Password Check Lifetime" required="true">
@@ -120,7 +139,7 @@
 
 <br />
 
-<h2>{{ 'POLICY.LOGIN_POLICY.ADVANCED' | translate }}</h2>
+<h3>{{ 'POLICY.LOGIN_POLICY.ADVANCED' | translate }}</h3>
 
 <div class="max-card-width login-policy-content" *ngIf="loginData">
   <div class="login-policy-row">
@@ -192,21 +211,6 @@
   </div>
 </div>
 
-<ng-container *ngIf="serviceType === PolicyComponentServiceType.MGMT && !isDefault">
-  <ng-template cnslHasRole [hasRole]="['policy.delete']">
-    <button
-      color="primary"
-      class="loginpolicy-reset-button"
-      matTooltip="{{ 'POLICY.RESET' | translate }}"
-      color="warn"
-      (click)="removePolicy()"
-      mat-stroked-button
-    >
-      {{ 'POLICY.RESET' | translate }}
-    </button>
-  </ng-template>
-</ng-container>
-
 <br />
 
 <div class="login-policy-btn-container">
diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json
index 121b701c6b..19ea132e68 100644
--- a/console/src/assets/i18n/de.json
+++ b/console/src/assets/i18n/de.json
@@ -1450,6 +1450,7 @@
     "DELETE_DESCRIPTION": "Sie sind im Begriff einen Identity Provider zu löschen. Die daruch hervorgerufenen Änderungen sind unwiederruflich. Wollen Sie dies wirklich tun?",
     "DELETE_SELECTION_TITLE": "Identity Providers löschen",
     "DELETE_SELECTION_DESCRIPTION": "Sie sind im Begriff mehrere Identity Provider zu löschen. Die daruch hervorgerufenen Änderungen sind unwiederruflich. Wollen Sie dies wirklich tun?",
+    "EMPTY": "Kein IDP vorhanden",
     "OIDC": {
       "TITLE": "OIDC IDP",
       "DESCRIPTION": "Geben Sie die Daten OIDC Identity Providers ein."
diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json
index 1a541ab360..16a3502c80 100644
--- a/console/src/assets/i18n/en.json
+++ b/console/src/assets/i18n/en.json
@@ -1450,6 +1450,7 @@
     "DELETE_DESCRIPTION": "You are about to delete an identity provider. The resulting changes are irrevocable. Do you really want to do this?",
     "DELETE_SELECTION_TITLE": "Delete Idp",
     "DELETE_SELECTION_DESCRIPTION": "You are about to delete an identity provider. The resulting changes are irrevocable. Do you really want to do this?",
+    "EMPTY": "No IPD available",
     "OIDC": {
       "TITLE": "OIDC IDP",
       "DESCRIPTION": "Enter the data for the OIDC Identity Provider."
diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json
index 41e9553edd..eb25212097 100644
--- a/console/src/assets/i18n/it.json
+++ b/console/src/assets/i18n/it.json
@@ -1450,6 +1450,7 @@
     "DELETE_DESCRIPTION": "Stai per rimuovere un fornitore di identit\u00e0. I cambiamenti risultanti sono irrevocabili. Vuoi davvero farlo?",
     "DELETE_SELECTION_TITLE": "Rimuovere IDP",
     "DELETE_SELECTION_DESCRIPTION": "Stai per rimuovere un fornitore di identit\u00e0. I cambiamenti risultanti sono irrevocabili. Vuoi davvero farlo?",
+    "EMPTY": "Nessun IDP disponible",
     "OIDC": {
       "TITLE": "OIDC IDP",
       "DESCRIPTION": "Inserisci i dati per il OIDC Identity Provider."
diff --git a/console/src/styles/toast.scss b/console/src/styles/toast.scss
index 0bd6430626..14f20ac47c 100644
--- a/console/src/styles/toast.scss
+++ b/console/src/styles/toast.scss
@@ -12,7 +12,7 @@
   //   }
 
   .data-e2e-failure {
-    background-color: $warn-color !important;
-    color: mat.get-color-from-palette($warn, default-contrast) !important;
+    color: $warn-color !important;
+    background-color: mat.get-color-from-palette($background, cards) !important;
   }
 }