diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
index e0b663d52c..2f98d0c871 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -139,13 +139,13 @@
       ></textarea>
     </ng-template>
 
-    <ng-template ngSwitchCase="password">
+    <ng-template ngSwitchCase="passwordinputgroup">
       <ng-template [ngTemplateOutlet]="label"></ng-template>
       <abp-password
         *abpReplaceableTemplate="{
           componentKey: passwordKey,
           inputs: {
-            appInfo: { value: prop }
+            prop: { value: prop }
           }
         }"
         [prop]="prop"
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
index 26a8f29b11..815a466c8f 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
@@ -32,6 +32,7 @@ import { FormProp } from '../../models/form-props';
 import { PropData } from '../../models/props';
 import { selfFactory } from '../../utils/factory.util';
 import { addTypeaheadTextSuffix } from '../../utils/typeahead.util';
+import { eThemeSharedComponents } from '../../enums/components';
 
 @Component({
   selector: 'abp-extensible-form-prop',
@@ -70,7 +71,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
 
   typeaheadModel: any;
 
-  passwordKey = 'ThemeShared.PasswordComponent';
+  passwordKey = eThemeSharedComponents.PasswordComponent;
 
   private readonly form: UntypedFormGroup;
 
@@ -163,8 +164,8 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
         return 'time';
       case ePropType.Typeahead:
         return 'typeahead';
-      case ePropType.Password:
-        return 'password';
+      case ePropType.PasswordInputGroup:
+        return 'passwordinputgroup';
       default:
         return prop.options ? 'select' : 'input';
     }
@@ -183,6 +184,8 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
         return 'email';
       case ePropType.Password:
         return 'password';
+      case ePropType.PasswordInputGroup:
+        return 'passwordinputgroup';
       default:
         return 'hidden';
     }
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/components.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/components.ts
new file mode 100644
index 0000000000..562041c807
--- /dev/null
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/components.ts
@@ -0,0 +1,3 @@
+export const enum eThemeSharedComponents {
+  PasswordComponent = 'ThemeShared.Extensions.PasswordComponent',
+}
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts
index 12d4a3571a..f6184a5e87 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/enums/props.enum.ts
@@ -8,6 +8,7 @@ export const enum ePropType {
   MultiSelect = 'multiselect',
   Number = 'number',
   Password = 'password',
+  PasswordInputGroup = 'passwordinputgroup',
   String = 'string',
   Text = 'text',
   Time = 'time',
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
index f786eb4ac8..7268be4395 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/public-api.ts
@@ -11,6 +11,7 @@ export * from './lib/constants/extra-properties';
 export * from './lib/directives/disabled.directive';
 export * from './lib/directives/prop-data.directive';
 export * from './lib/enums/props.enum';
+export * from './lib/enums/components';
 export {
   ActionCallback,
   ActionList,