diff --git a/npm/ng-packs/packages/account/src/lib/components/login/login.component.html b/npm/ng-packs/packages/account/src/lib/components/login/login.component.html
index 130b013d55..db4e7e9f45 100644
--- a/npm/ng-packs/packages/account/src/lib/components/login/login.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/login/login.component.html
@@ -3,7 +3,9 @@
     <h4>{{ 'AbpAccount::Login' | abpLocalization }}</h4>
     <strong>
       {{ 'AbpAccount::AreYouANewUser' | abpLocalization }}
-      <a class="text-decoration-none" routerLink="/account/register">{{ 'AbpAccount::Register' | abpLocalization }}</a>
+      <a class="text-decoration-none" routerLink="/account/register">{{
+        'AbpAccount::Register' | abpLocalization
+      }}</a>
     </strong>
     <form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
       <div class="form-group">
@@ -15,16 +17,28 @@
           type="text"
           id="login-input-user-name-or-email-address"
           formControlName="username"
+          autocomplete="username"
           autofocus
         />
       </div>
       <div class="form-group">
         <label for="login-input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label>
-        <input class="form-control" type="password" id="login-input-password" formControlName="password" />
+        <input
+          class="form-control"
+          type="password"
+          id="login-input-password"
+          formControlName="password"
+          autocomplete="current-password"
+        />
       </div>
       <div class="form-check" validationTarget validationStyle>
         <label class="form-check-label" for="login-input-remember-me">
-          <input class="form-check-input" type="checkbox" id="login-input-remember-me" formControlName="remember" />
+          <input
+            class="form-check-input"
+            type="checkbox"
+            id="login-input-remember-me"
+            formControlName="remember"
+          />
           {{ 'AbpAccount::RememberMe' | abpLocalization }}
         </label>
       </div>
diff --git a/npm/ng-packs/packages/account/src/lib/components/register/register.component.html b/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
index 41d619a16a..eebd20cdde 100644
--- a/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
@@ -3,21 +3,43 @@
     <h4>{{ 'AbpAccount::Register' | abpLocalization }}</h4>
     <strong>
       {{ 'AbpAccount::AlreadyRegistered' | abpLocalization }}
-      <a class="text-decoration-none" routerLink="/account/login">{{ 'AbpAccount::Login' | abpLocalization }}</a>
+      <a class="text-decoration-none" routerLink="/account/login">{{
+        'AbpAccount::Login' | abpLocalization
+      }}</a>
     </strong>
     <form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
       <div class="form-group">
         <label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label
         ><span> * </span
-        ><input autofocus type="text" id="input-user-name" class="form-control" formControlName="username" />
+        ><input
+          autofocus
+          type="text"
+          id="input-user-name"
+          class="form-control"
+          formControlName="username"
+          autocomplete="username"
+        />
       </div>
       <div class="form-group">
         <label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label
-        ><span> * </span><input type="email" id="input-email-address" class="form-control" formControlName="email" />
+        ><span> * </span
+        ><input
+          type="email"
+          id="input-email-address"
+          class="form-control"
+          formControlName="email"
+        />
       </div>
       <div class="form-group">
         <label for="input-password">{{ 'AbpAccount::Password' | abpLocalization }}</label
-        ><span> * </span><input type="password" id="input-password" class="form-control" formControlName="password" />
+        ><span> * </span
+        ><input
+          type="password"
+          id="input-password"
+          class="form-control"
+          formControlName="password"
+          autocomplete="current-password"
+        />
       </div>
       <abp-button
         [loading]="inProgress"
diff --git a/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts
index f6a7e9beb8..7ddccdd69a 100644
--- a/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts
+++ b/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts
@@ -132,7 +132,7 @@ export class ReplaceableTemplateDirective implements OnInit, OnDestroy, OnChange
   setProvidedData() {
     this.providedData = { ...this.data, inputs: {} };
 
-    if (!this.providedData.inputs) return;
+    if (!this.data.inputs) return;
     Object.defineProperties(this.providedData.inputs, {
       ...Object.keys(this.data.inputs).reduce(
         (acc, key) => ({