diff --git a/console/src/app/modules/idp-table/idp-table.component.scss b/console/src/app/modules/idp-table/idp-table.component.scss
index bab489b89..4c7626bcc 100644
--- a/console/src/app/modules/idp-table/idp-table.component.scss
+++ b/console/src/app/modules/idp-table/idp-table.component.scss
@@ -29,7 +29,7 @@ tr {
   outline: none;
 
   &.disabled * {
-    color: var(--grey);
+    opacity: .8;
   }
 
   button {
diff --git a/console/src/app/modules/idp-table/idp-table.component.ts b/console/src/app/modules/idp-table/idp-table.component.ts
index 3c1ed9140..d75f49b8b 100644
--- a/console/src/app/modules/idp-table/idp-table.component.ts
+++ b/console/src/app/modules/idp-table/idp-table.component.ts
@@ -170,7 +170,13 @@ export class IdpTableComponent implements OnInit {
         if (row.id) {
             switch (this.serviceType) {
                 case PolicyComponentServiceType.MGMT:
-                    return ['/org', 'idp', row.id];
+                    switch ((row as MgmtIdpView.AsObject).providerType) {
+                        case IdpProviderType.IDPPROVIDERTYPE_SYSTEM:
+                            return ['/iam', 'idp', row.id];
+                        case IdpProviderType.IDPPROVIDERTYPE_ORG:
+                            return ['/org', 'idp', row.id];
+                    }
+                    break;
                 case PolicyComponentServiceType.ADMIN:
                     return ['/iam', 'idp', row.id];
             }
diff --git a/console/src/app/modules/idp/idp.component.html b/console/src/app/modules/idp/idp.component.html
index d97d7db75..987cd1b9e 100644
--- a/console/src/app/modules/idp/idp.component.html
+++ b/console/src/app/modules/idp/idp.component.html
@@ -12,6 +12,14 @@
                         <mat-label>{{ 'IDP.NAME' | translate }}</mat-label>
                         <input matInput formControlName="name" />
                     </mat-form-field>
+                    <mat-form-field class="formfield" appearance="outline">
+                        <mat-label>{{ 'IDP.STYLE' | translate }}</mat-label>
+                        <mat-select formControlName="stylingType">
+                            <mat-option *ngFor="let field of styleFields" [value]="field">
+                                {{ 'IDP.STYLEFIELD.'+field | translate }}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
                 </div>
             </ng-container>
 
@@ -75,14 +83,6 @@
                                 </mat-option>
                             </mat-select>
                         </mat-form-field>
-                        <mat-form-field class="formfield" appearance="outline">
-                            <mat-label>{{ 'IDP.STYLE' | translate }}</mat-label>
-                            <mat-select formControlName="usernameMapping">
-                                <mat-option *ngFor="let field of styleFields" [value]="field">
-                                    {{ 'IDP.STYLEFIELD.'+field | translate }}
-                                </mat-option>
-                            </mat-select>
-                        </mat-form-field>
                     </div>
                 </ng-container>
 
diff --git a/console/src/app/modules/idp/idp.component.ts b/console/src/app/modules/idp/idp.component.ts
index e6bd1bd72..64d550ebe 100644
--- a/console/src/app/modules/idp/idp.component.ts
+++ b/console/src/app/modules/idp/idp.component.ts
@@ -66,7 +66,6 @@ export class IdpComponent implements OnInit, OnDestroy {
         });
 
         this.route.data.pipe(switchMap(data => {
-            console.log(data.serviceType);
             this.serviceType = data.serviceType;
             switch (this.serviceType) {
                 case PolicyComponentServiceType.MGMT: