diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html
index ec67a675f4..642db92fbb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html
@@ -31,7 +31,7 @@
           </tb-resource-autocomplete>
           <mat-checkbox [(ngModel)]="resource.isModule"
                         (ngModelChange)="notifyActionUpdated()">
-            {{ 'widget.resource-is-module' | translate }}
+            {{ 'widget.resource-is-extension' | translate }}
           </mat-checkbox>
           <button mat-icon-button color="primary"
                   [disabled]="isLoading$ | async"
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
index 416297a80a..63a1667cb7 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.html
@@ -131,7 +131,7 @@
                       </tb-resource-autocomplete>
                       <mat-checkbox [(ngModel)]="resource.isModule"
                                     (ngModelChange)="isDirty = true">
-                        {{ 'widget.resource-is-module' | translate }}
+                        {{ 'widget.resource-is-extension' | translate }}
                       </mat-checkbox>
                       <button mat-icon-button color="primary"
                               [disabled]="isLoading$ | async"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
index 22d41e2cdc..417fc35bf4 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
@@ -292,6 +292,12 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
           this.entityRequiredText = 'mobile.bundle-required';
           this.notFoundEntities = 'mobile.no-bundle-text';
           break;
+        case EntityType.NOTIFICATION_TARGET:
+          this.entityText = 'notification.notification-recipient';
+          this.noEntitiesMatchingText = 'notification.no-recipients-matching';
+          this.entityRequiredText = 'notification.notification-recipient-required';
+          this.notFoundEntities = 'notification.no-recipients-text';
+          break;
         case AliasEntityType.CURRENT_CUSTOMER:
           this.entityText = 'customer.default-customer';
           this.noEntitiesMatchingText = 'customer.no-customers-matching';
diff --git a/ui-ngx/src/assets/locale/locale.constant-ar_AE.json b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json
index 695e1ad441..2fd045dad0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ar_AE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json
@@ -6016,7 +6016,6 @@
         "type": "نوع الأداة",
         "resources": "الموارد",
         "resource-url": "رابط JavaScript/CSS",
-        "resource-is-module": "هو وحدة",
         "remove-resource": "إزالة المورد",
         "add-resource": "إضافة مورد",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 43a644a537..d986a24970 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -4453,7 +4453,6 @@
         "type": "Tipus",
         "resources": "Recursos",
         "resource-url": "URL JavaScript/CSS",
-        "resource-is-module": "És mòdul",
         "remove-resource": "Eliminar recurs",
         "add-resource": "Afegir recurs",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index 4ae54c4d65..ab3f6cba56 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -2734,7 +2734,6 @@
         "type": "Typ widgetu",
         "resources": "Zdroje",
         "resource-url": "JavaScript/CSS URL",
-        "resource-is-module": "Je modulem",
         "remove-resource": "Odebrat zdroj",
         "add-resource": "Přidat zdroj",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index fbfeddd886..4759b873b4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -3252,7 +3252,6 @@
     "type": "Widget-type",
     "resources": "Ressourcer",
     "resource-url": "JavaScript/CSS URL",
-    "resource-is-module": "Er modul",
     "remove-resource": "Fjern ressource",
     "add-resource": "Tilføj ressource",
     "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 76e1ada0e0..c75a8faa3e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3710,6 +3710,8 @@
         "no-notification-templates": "No notification templates found",
         "no-notifications-yet": "No notifications yet",
         "no-recipients-notification": "No recipients notification",
+        "no-recipients-matching": "No recipients matching '{{entity}}' were found.",
+        "no-recipients-text": "No recipient found",
         "no-rule": "No rule configured",
         "no-rules-notification": "No rules notification",
         "no-severity-found": "No severity found",
@@ -3754,6 +3756,8 @@
             "users-entity-owner": "Users of the entity owner"
         },
         "recipients": "Recipients",
+        "notification-recipient": "Notification recipient",
+        "notification-recipient-required": "Notification recipient is required.",
         "notification-recipients": "Notifications / Recipients",
         "recipients-count": "{ count, plural, =1 {1 recipient} other {# recipients} }",
         "recipients-required": "Recipients are required",
@@ -5427,7 +5431,7 @@
         "type": "Widget type",
         "resources": "Resources",
         "resource-url": "JavaScript/CSS URL",
-        "resource-is-module": "Is module",
+        "resource-is-extension": "Is extension",
         "remove-resource": "Remove resource",
         "add-resource": "Add resource",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 1122c1d6fa..8b7f07d789 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -4556,7 +4556,6 @@
         "type": "Tipo de widget",
         "resources": "Recursos",
         "resource-url": "URL JavaScript/CSS",
-        "resource-is-module": "Es módulo",
         "remove-resource": "Eliminar recurso",
         "add-resource": "Agregar recurso",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index 80a2cb0830..ef1a09c00f 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -2142,7 +2142,6 @@
         "type": "위젯 타입",
         "resources": "리소스",
         "resource-url": "JavaScript/CSS URI",
-        "resource-is-module": "모듈 여부",
         "remove-resource": "리소스 삭제",
         "add-resource": "리소스 추가",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
index 89191ea064..73ed884662 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lt_LT.json
@@ -5893,7 +5893,6 @@
         "type": "Tipas",
         "resources": "Resursai",
         "resource-url": "JavaScript/CSS URL",
-        "resource-is-module": "Is module",
         "remove-resource": "Panaikinti resursą",
         "add-resource": "Pridėti resursą",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json
index 7b99ad9953..348eea95b0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json
@@ -5531,7 +5531,6 @@
         "type": "Type widget",
         "resources": "Weg",
         "resource-url": "JavaScript/CSS-URL",
-        "resource-is-module": "Is-module",
         "remove-resource": "Bron verwijderen",
         "add-resource": "Bron toevoegen",
         "html": ".HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
index b369f061b7..26e7e23d63 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
@@ -5910,7 +5910,6 @@
         "type": "Typ widgetu",
         "resources": "Biblioteki",
         "resource-url": "Adres URL JavaScript/CSS",
-        "resource-is-module": "Jest modułem",
         "remove-resource": "Usuń zasób",
         "add-resource": "Dodaj zasób",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
index bfc616e40b..eb20180447 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -1729,7 +1729,6 @@
     "type": "Tipo de widget",
     "resources": "Recursos",
     "resource-url": "URL de JavaScript/CSS",
-    "resource-is-module": "É módulo",
     "remove-resource": "Remover recurso",
     "add-resource": "Adicionar recurso",
     "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index 668bf8c2c9..b667fd0b46 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -2143,7 +2143,6 @@
     "type": "Vrsta pripomočka",
     "resources": "Viri",
     "resource-url": "URL JavaScript / CSS",
-    "resource-is-module": "Je modul",
     "remove-resource": "Odstrani vir",
     "add-resource": "Dodaj vir",
     "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index 47096fe5f2..54172aa1ac 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -4771,7 +4771,6 @@
         "type": "类型",
         "resources": "资源",
         "resource-url": "JavaScript/CSS",
-        "resource-is-module": "是否模块",
         "remove-resource": "删除资源",
         "add-resource": "添加资源",
         "html": "HTML",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index 64b4c71f16..599da1b41e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -3310,7 +3310,6 @@
         "type": "部件類型",
         "resources": "資源",
         "resource-url": "JavaScript/CSS URL",
-        "resource-is-module": "是模組",
         "remove-resource": "刪除資源",
         "add-resource": "增加資源",
         "html": "HTML",