diff --git a/demo-shell/src/app/components/error/demo-error.component.html b/demo-shell/src/app/components/error/demo-error.component.html
index 94ed8e36f1..5e2e1b9d4c 100644
--- a/demo-shell/src/app/components/error/demo-error.component.html
+++ b/demo-shell/src/app/components/error/demo-error.component.html
@@ -1,15 +1,22 @@
-<div fxLayout="column" fxLayoutAlign="center center">
+<div fxLayout="column"
+     fxLayoutAlign="center center">
     <adf-error-content [errorCode]="errorCode">
-        <div adf-error-content-actions class="app-error-content-buttons">
-            <a a id="adf-secondary-button" mat-raised-button color="primary"
-                 (click)="onReportIssue()"
-                class="app-error-content-description-link">
+        <div adf-error-content-actions
+             class="app-error-content-buttons">
+            <a *ngIf="'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate"
+                id="adf-secondary-button"
+               mat-raised-button
+               color="primary"
+               (click)="onReportIssue()"
+               class="app-error-content-description-link">
                 {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
             </a>
-            <a id="adf-return-button" mat-raised-button color="primary" (click)="onReturnButton()">
+            <a id="adf-return-button"
+               mat-raised-button
+               color="primary"
+               (click)="onReturnButton()">
                 {{ 'ERROR_CONTENT.' + errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }}
             </a>
         </div>
     </adf-error-content>
 </div>
-
diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts
index a8b3aa2073..b9d31c9223 100644
--- a/e2e/content-services/permissions/permissions-component.e2e.ts
+++ b/e2e/content-services/permissions/permissions-component.e2e.ts
@@ -227,9 +227,9 @@ describe('Permissions Component', () => {
             await permissionsPage.addPermissionsDialog.clickAddPermissionButton();
             await permissionsPage.addPermissionsDialog.checkAddPermissionDialogIsDisplayed();
             await permissionsPage.addPermissionsDialog.checkSearchUserInputIsDisplayed();
-            await permissionsPage.addPermissionsDialog.searchUserOrGroup('GROUP_' + groupBody.id);
-            await permissionsPage.addPermissionsDialog.clickUserOrGroup('GROUP_' + groupBody.id);
-            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded('GROUP_' + groupBody.id);
+            await permissionsPage.addPermissionsDialog.searchUserOrGroup(groupBody.id);
+            await permissionsPage.addPermissionsDialog.clickUserOrGroup(groupBody.displayName);
+            await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded(groupBody.id);
         });
 
         it('[C277100] Should display EVERYONE group in the search result set', async () => {
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
index c7a16bce98..d37f09ac61 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
@@ -54,8 +54,8 @@
                 <mat-icon id="add-person-icon" mat-list-icon>person_add</mat-icon>
             </ng-template>
             <p>
-             {{item.entry?.properties['cm:authorityName']?
-                                    item.entry?.properties['cm:authorityName'] :
+             {{item.entry?.properties['cm:authorityDisplayName']?
+                                    item.entry?.properties['cm:authorityDisplayName'] :
                                     item.entry?.properties['cm:owner']?.displayName}}</p>
         </mat-list-option>
     </mat-selection-list>
diff --git a/lib/core/i18n/en.json b/lib/core/i18n/en.json
index 42c185c993..c4a399ad70 100644
--- a/lib/core/i18n/en.json
+++ b/lib/core/i18n/en.json
@@ -429,6 +429,16 @@
         "TEXT": "Back to home"
       }
     },
+    "503": {
+      "TITLE": "An error occurred.",
+      "DESCRIPTION": "Service Temporarily Unavailable [503].",
+      "SECONDARY_BUTTON": {
+        "TEXT": ""
+      },
+      "RETURN_BUTTON": {
+        "TEXT": "Back to home"
+      }
+    },
     "504": {
       "TITLE": "An error occurred.",
       "DESCRIPTION": "The server timed out, try again or contact IT support [504].",