diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.html
index c7eeaa253b..ea922c1aa7 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.html
@@ -151,7 +151,7 @@
       @if (refEntityKeyFormGroup.get('type').value !== ArgumentType.Rolling) {
         <div class="tb-form-row">
           <div class="fixed-title-width" [class.tb-required]="defaultValueRequired">{{ 'calculated-fields.default-value' | translate }}</div>
-          <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
+          <mat-form-field class="flex-1 overflow-hidden" appearance="outline" subscriptSizing="dynamic">
             <input matInput autocomplete="off" name="value" formControlName="defaultValue" placeholder="{{ 'action.set' | translate }}"/>
             @if (argumentFormGroup.get('defaultValue').touched && argumentFormGroup.get('defaultValue').hasError('required')) {
               <mat-icon matSuffix
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
index 4e8abbe841..89db142fac 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
@@ -168,7 +168,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
   saveArgument(): void {
     const value = this.argumentFormGroup.value as CalculatedFieldArgumentValue;
     if (this.entityType === ArgumentEntityType.Owner) {
-      value.refDynamicSourceConfiguration.type = ArgumentEntityType.Owner;
+      value.refDynamicSourceConfiguration = {type: ArgumentEntityType.Owner};
     } else if (this.entityType === ArgumentEntityType.Tenant) {
       value.refEntityId = new TenantId(this.tenantId) as any;
     }
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/propagate-arguments-table.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/propagate-arguments-table.component.ts
index 04d1dbf91b..75e66afef5 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/propagate-arguments-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/propagate-arguments-table.component.ts
@@ -32,7 +32,7 @@ import {
   CalculatedFieldArgumentsTableComponent
 } from '@home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component';
 import { ArgumentEntityType, ArgumentType, CalculatedFieldArgumentValue } from '@shared/models/calculated-field.models';
-import { isDefined } from '@core/utils';
+import { isDefined, isUndefinedOrNull } from '@core/utils';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 
 @Component({
@@ -94,14 +94,14 @@ export class PropagateArgumentsTableComponent extends CalculatedFieldArgumentsTa
   }
 
   protected isEditButtonShowBadge(argument: CalculatedFieldArgumentValue): boolean {
-    if (!this.isScript && isDefined(argument?.refEntityId)) {
+    if (!this.isScript && (isDefined(argument?.refEntityId) || isDefined(argument?.refDynamicSourceConfiguration))) {
       return false;
     }
     return super.isEditButtonShowBadge(argument);
   }
 
   protected updateErrorText(): void {
-    if (!this.isScript && this.argumentsFormArray.controls.some(control => isDefined(control.value?.refEntityId))) {
+    if (!this.isScript && this.argumentsFormArray.controls.some(control => isDefined(control.value?.refEntityId) || isDefined(control.value.refDynamicSourceConfiguration))) {
       this.errorText = 'calculated-fields.hint.arguments-propagate-argument-entity-type';
     } else if (!this.isScript && this.argumentsFormArray.controls.some(control => control.value.refEntityKey.type === ArgumentType.Rolling)) {
       this.errorText = 'calculated-fields.hint.arguments-propagate-arguments-with-rolling';
@@ -109,6 +109,8 @@ export class PropagateArgumentsTableComponent extends CalculatedFieldArgumentsTa
       this.errorText = 'calculated-fields.hint.arguments-entity-not-found';
     } else if (!this.argumentsFormArray.controls.length) {
       this.errorText = 'calculated-fields.hint.arguments-empty';
+    } if (this.isScript && !this.argumentsFormArray.controls.some(control => isUndefinedOrNull(control.value?.refEntityId) && isUndefinedOrNull(control.value.refDynamicSourceConfiguration))) {
+      this.errorText = 'calculated-fields.hint.arguments-propagate-argument-must-current-entity';
     } else {
       this.errorText = '';
     }
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
index dccab5cfd5..70bfa43c63 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
@@ -58,7 +58,11 @@ export class CalculatedFieldDebugDialogComponent extends DialogComponent<Calcula
   }
 
   ngAfterViewInit(): void {
-    this.eventsTable.entitiesTable.cellActionDescriptors[0].isEnabled = (event => this.data.value.type === CalculatedFieldType.SCRIPT && !!(event as Event).body.arguments);
+    this.eventsTable.entitiesTable.cellActionDescriptors[0].isEnabled = (event => {
+      return (this.data.value.type === CalculatedFieldType.SCRIPT ||
+        (this.data.value.type === CalculatedFieldType.PROPAGATION && this.data.value.configuration.applyExpressionToResolvedArguments)
+      ) && !!(event as Event).body.arguments
+    });
     this.eventsTable.entitiesTable.updateData();
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 08bf1328d8..46a93ac07b 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -79,6 +79,7 @@
                                         [entityId]="data.entityId"
                                         [entityName]="data.entityName"
                                         [tenantId]="data.tenantId"
+                                        [ownerId]="data.ownerId"
                                         [testScript]="onTestScript.bind(this)"
           ></tb-propagation-configuration>
         }
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
index 250d6bd120..1f5444f8b3 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
@@ -176,7 +176,7 @@
       </div>
     </ng-container>
     <ng-container>
-      @if (entityFilter.singleEntity?.id) {
+      @if (entityFilter.singleEntity?.id || entityType === ArgumentEntityType.RelationQuery || entityType === ArgumentEntityType.Current) {
         <div class="tb-form-row">
           <div class="fixed-title-width tb-required" tb-hint-tooltip-icon="{{'calculated-fields.hint.perimeter-attribute-key' | translate}}">
             {{ 'calculated-fields.perimeter-attribute-key' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.ts
index 0e18521572..6698de93b9 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.ts
@@ -198,8 +198,7 @@ export class CalculatedFieldGeofencingZoneGroupsPanelComponent implements OnInit
         break;
       case ArgumentEntityType.Owner:
         delete value.refEntityId;
-        value.refDynamicSourceConfiguration ||= { type: ArgumentEntityType.Owner };
-        value.refDynamicSourceConfiguration.type = ArgumentEntityType.Owner;
+        value.refDynamicSourceConfiguration = {type: ArgumentEntityType.Owner};
         break;
       case ArgumentEntityType.RelationQuery:
         delete value.refEntityId;
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
index b6f0343885..cc8cf7dc4f 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
@@ -54,6 +54,7 @@
                                   [entityId]="entityId"
                                   [tenantId]="tenantId"
                                   [entityName]="entityName"
+                                  [ownerId]="ownerId"
                                   [isScript]="this.propagateConfiguration.get('applyExpressionToResolvedArguments').value"/>
   </div>
   <div class="tb-form-panel no-gap" [class.!hidden]="!this.propagateConfiguration.get('applyExpressionToResolvedArguments').value">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.ts
index 4fb8bb561e..4485ef2032 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.ts
@@ -70,6 +70,9 @@ export class PropagationConfigurationComponent implements ControlValueAccessor,
   @Input({required: true})
   entityName: string;
 
+  @Input({required: true})
+  ownerId: EntityId;
+
   @Input({required: true})
   testScript: () => Observable<string>;
 
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
index f88244add1..05f872ab25 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
@@ -39,6 +39,7 @@
           <div class="fixed-title-width-230">{{ 'mobile.bundle' | translate }}</div>
           <tb-entity-autocomplete
             class="flex-1"
+            required
             inlineField
             useFullEntityId
             placeholder="{{ 'mobile.bundle' | translate }}"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
index 512ae42921..4e03ca09de 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
@@ -18,7 +18,6 @@
 <mat-form-field [formGroup]="selectEntityFormGroup"
                 [class.tb-inline-field]="inlineField"
                 [class.flex]="inlineField"
-                [class.tb-suffix-absolute]="inlineField && !selectEntityFormGroup.get('entity').value"
                 class="mat-block"
                 [appearance]="inlineField ? 'outline' : appearance"
                 [subscriptSizing]="inlineField ? 'dynamic' : subscriptSizing"
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 c0ce4de8d2..a542ca33b6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1197,6 +1197,7 @@
             "arguments-simple-with-rolling": "Simple type calculated field should not contain keys with time series rolling type.",
             "arguments-propagate-arguments-with-rolling": "'Time series rolling' type is incompatible with 'Arguments only' propagation.",
             "arguments-propagate-argument-entity-type": "Entity type is incompatible with 'Arguments only' propagation.",
+            "arguments-propagate-argument-must-current-entity": "At least one argument must be configured with the 'Current entity' source entity type.",
             "arguments-empty": "Arguments should not be empty.",
             "expression-required": "Expression is required.",
             "expression-invalid": "Expression is invalid",