diff --git a/demo-shell/src/app/components/permissions/demo-permissions.component.ts b/demo-shell/src/app/components/permissions/demo-permissions.component.ts
index 87576ec947..49455b8c51 100644
--- a/demo-shell/src/app/components/permissions/demo-permissions.component.ts
+++ b/demo-shell/src/app/components/permissions/demo-permissions.component.ts
@@ -73,7 +73,7 @@ export class DemoPermissionComponent implements OnInit {
 
     showErrorMessage(error) {
         this.notificationService.openSnackMessage(
-            error,
+            JSON.parse(error.response.text).error.errorKey,
             4000
         );
     }
diff --git a/lib/content-services/i18n/en.json b/lib/content-services/i18n/en.json
index fdeb118602..108fdd2d89 100644
--- a/lib/content-services/i18n/en.json
+++ b/lib/content-services/i18n/en.json
@@ -271,7 +271,8 @@
       "NO-RESULT": "No result found for this search",
       "ADD-ACTION": "ADD",
       "CLOSE-ACTION": "CLOSE",
-      "BASE-DIALOG-TITLE": "Search a group or people to add..."
+      "BASE-DIALOG-TITLE": "Search a group or people to add...",
+      "EVERYONE" : "EVERYONE"
     },
     "ERROR": {
       "DUPLICATE-PERMISSION": "One or more of the permission you set is already present : {{list}}"
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
index 801c16b3de..71aeb9956c 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
@@ -46,6 +46,17 @@
                                     item.entry?.properties['cm:authorityName'] :
                                     item.entry?.properties['cm:firstName']}}</p>
         </mat-list-option>
+        <mat-list-option *ngIf="data?.list?.entries.length !== 0"
+                    id="adf-add-permission-group-everyone"
+                    class="adf-list-option-item"
+                    (click)="elementClicked(EVERYONE)">
+            <mat-icon mat-list-icon id="add-group-icon">
+                group_add
+            </mat-icon>
+            <p>
+                {{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
+            </p>
+        </mat-list-option>
     </mat-selection-list>
     <div *ngIf="data?.list?.entries.length === 0" class="adf-permission-no-result" id="adf-add-permission-no-results">
         <span>{{'PERMISSION_MANAGER.ADD-PERMISSION.NO-RESULT' | translate}}</span>
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
index d6e869e282..c5a1870d4b 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
@@ -153,4 +153,23 @@ describe('AddPermissionPanelComponent', () => {
         });
     }));
 
+    it('should always show as extra result the everyone group', async(() => {
+        searchApiService = fixture.componentRef.injector.get(SearchService);
+        spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
+        component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
+
+        typeWordIntoSearchInput('a');
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(element.querySelector('#adf-add-permission-authority-results')).not.toBeNull();
+            expect(element.querySelector('#result_option_0 #add-person-icon')).toBeDefined();
+            expect(element.querySelector('#result_option_0 #add-person-icon')).not.toBeNull();
+            expect(element.querySelector('#result_option_2 #add-group-icon')).toBeDefined();
+            expect(element.querySelector('#result_option_2 #add-group-icon')).not.toBeNull();
+            expect(element.querySelector('#adf-add-permission-group-everyone')).toBeDefined();
+            expect(element.querySelector('#adf-add-permission-group-everyone')).not.toBeNull();
+        });
+    }));
+
 });
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.ts
index 63eddf1137..758e774420 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.ts
@@ -48,6 +48,8 @@ export class AddPermissionPanelComponent {
 
     selectedItems: MinimalNodeEntity[] = [];
 
+    EVERYONE: MinimalNodeEntity = { entry: { properties: {'cm:authorityName': 'GROUP_EVERYONE'}}};
+
     constructor() {
         this.searchInput.valueChanges
         .pipe(