diff --git a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html
index 154b8cfba8..074b6d53ac 100644
--- a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html
@@ -1,18 +1,20 @@
 <form [formGroup]="form" (ngSubmit)="onSubmit()" [mapErrorsFn]="mapErrorsFn" validateOnSubmit class="abp-md-form">
-  <div *ngIf="!hideCurrentPassword" class="mb-3 form-group">
-    <label for="current-password" class="form-label">{{
-      'AbpIdentity::DisplayName:CurrentPassword' | abpLocalization
-    }}</label
-    ><span> * </span
-    ><input
-      type="password"
-      id="current-password"
-      class="form-control"
-      formControlName="password"
-      autofocus
-      autocomplete="current-password"
-    />
-  </div>
+  @if (!hideCurrentPassword) {
+    <div class="mb-3 form-group">
+      <label for="current-password" class="form-label">{{
+        'AbpIdentity::DisplayName:CurrentPassword' | abpLocalization
+      }}</label
+      ><span> * </span
+      ><input
+        type="password"
+        id="current-password"
+        class="form-control"
+        formControlName="password"
+        autofocus
+        autocomplete="current-password"
+      />
+    </div>
+  }
   <div class="mb-3 form-group">
     <label for="new-password" class="form-label">{{
       'AbpIdentity::DisplayName:NewPassword' | abpLocalization
diff --git a/npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.html b/npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.html
index 7fd02e7a0b..248faae625 100644
--- a/npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.html
@@ -1,35 +1,30 @@
 <h4>{{ 'AbpAccount::ForgotPassword' | abpLocalization }}</h4>
 
-<form
-  *ngIf="!isEmailSent; else emailSentTemplate"
-  [formGroup]="form"
-  (ngSubmit)="onSubmit()"
-  validateOnSubmit
->
-  <p>{{ 'AbpAccount::SendPasswordResetLink_Information' | abpLocalization }}</p>
-  <div class="mb-3 form-group">
-    <label for="input-email-address" class="form-label">{{
-      'AbpAccount::EmailAddress' | abpLocalization
-    }}</label
-    ><span> * </span>
-    <input type="email" id="input-email-address" class="form-control" formControlName="email" />
-  </div>
-  <abp-button
-    class="d-block"
-    buttonClass="mt-2 mb-3 btn btn-primary btn-block"
-    [loading]="inProgress"
-    buttonType="submit"
-    [disabled]="form?.invalid"
-  >
-    {{ 'AbpAccount::Submit' | abpLocalization }}
-  </abp-button>
-  <a routerLink="/account/login"
-    ><i class="fa fa-long-arrow-left me-1" aria-hidden="true"></i
-    >{{ 'AbpAccount::Login' | abpLocalization }}</a
-  >
-</form>
-
-<ng-template #emailSentTemplate>
+@if (!isEmailSent) {
+  <form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit>
+    <p>{{ 'AbpAccount::SendPasswordResetLink_Information' | abpLocalization }}</p>
+    <div class="mb-3 form-group">
+      <label for="input-email-address" class="form-label">{{
+        'AbpAccount::EmailAddress' | abpLocalization
+      }}</label
+      ><span> * </span>
+      <input type="email" id="input-email-address" class="form-control" formControlName="email" />
+    </div>
+    <abp-button
+      class="d-block"
+      buttonClass="mt-2 mb-3 btn btn-primary btn-block"
+      [loading]="inProgress"
+      buttonType="submit"
+      [disabled]="form?.invalid"
+    >
+      {{ 'AbpAccount::Submit' | abpLocalization }}
+    </abp-button>
+    <a routerLink="/account/login"
+      ><i class="fa fa-long-arrow-left me-1" aria-hidden="true"></i
+      >{{ 'AbpAccount::Login' | abpLocalization }}</a
+    >
+  </form>
+} @else {
   <p>
     {{ 'AbpAccount::PasswordResetMailSentMessage' | abpLocalization }}
   </p>
@@ -40,4 +35,4 @@
       {{ 'AbpAccount::BackToLogin' | abpLocalization }}
     </button>
   </a>
-</ng-template>
+}
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 6e288bd1ce..4919253456 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
@@ -1,10 +1,12 @@
 <h4>{{ 'AbpAccount::Login' | abpLocalization }}</h4>
-<strong *ngIf="isSelfRegistrationEnabled">
-  {{ 'AbpAccount::AreYouANewUser' | abpLocalization }}
-  <a class="text-decoration-none" routerLink="/account/register" queryParamsHandling="preserve">{{
-    'AbpAccount::Register' | abpLocalization
-  }}</a>
-</strong>
+@if (isSelfRegistrationEnabled) {
+  <strong>
+    {{ 'AbpAccount::AreYouANewUser' | abpLocalization }}
+    <a class="text-decoration-none" routerLink="/account/register" queryParamsHandling="preserve">{{
+      'AbpAccount::Register' | abpLocalization
+    }}</a>
+  </strong>
+}
 <form [formGroup]="form" (ngSubmit)="onSubmit()" validateOnSubmit class="mt-4">
   <div class="mb-3 form-group">
     <label for="login-input-user-name-or-email-address" class="form-label">{{
@@ -20,7 +22,9 @@
     />
   </div>
   <div class="mb-3 form-group">
-    <label for="login-input-password" class="form-label">{{ 'AbpAccount::Password' | abpLocalization }}</label>
+    <label for="login-input-password" class="form-label">{{
+      'AbpAccount::Password' | abpLocalization
+    }}</label>
     <input
       class="form-control"
       type="password"
diff --git a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html
index 19758029e5..6eff5e9ed6 100644
--- a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html
@@ -1,22 +1,20 @@
 <div id="AbpContentToolbar"></div>
-<div class="card border-0 shadow-sm min-h-400" [abpLoading]="!(profile$ | async)?.userName" >
+<div class="card border-0 shadow-sm min-h-400" [abpLoading]="!(profile$ | async)?.userName">
   <div class="card-body">
     <div class="row">
       <div class="col-12 col-md-3">
         <ul class="nav flex-column nav-pills" id="nav-tab" role="tablist">
-          <li
-            *ngIf="!hideChangePasswordTab && (profile$ | async)"
-            class="nav-item"
-            (click)="selectedTab = 0"
-          >
-            <a
-              class="nav-link"
-              [ngClass]="{ active: selectedTab === 0 }"
-              role="tab"
-              href="javascript:void(0)"
-              >{{ 'AbpUi::ChangePassword' | abpLocalization }}</a
-            >
-          </li>
+          @if (!hideChangePasswordTab && (profile$ | async)) {
+            <li class="nav-item" (click)="selectedTab = 0">
+              <a
+                class="nav-link"
+                [ngClass]="{ active: selectedTab === 0 }"
+                role="tab"
+                href="javascript:void(0)"
+                >{{ 'AbpUi::ChangePassword' | abpLocalization }}</a
+              >
+            </li>
+          }
           <li class="nav-item mb-2" (click)="selectedTab = 1">
             <a
               class="nav-link"
@@ -28,34 +26,40 @@
           </li>
         </ul>
       </div>
-      <div *ngIf="profile$ | async" class="col-12 col-md-9">
-        <div class="tab-content" *ngIf="selectedTab === 0" [@fadeIn]>
-          <div class="tab-pane active" role="tabpanel">
-            <h4>
-              {{ 'AbpIdentity::ChangePassword' | abpLocalization }}
-              <hr />
-            </h4>
-            <abp-change-password-form
-              *abpReplaceableTemplate="{
-                componentKey: changePasswordKey
-              }"
-            ></abp-change-password-form>
-          </div>
+      @if (profile$ | async) {
+        <div class="col-12 col-md-9">
+          @if (selectedTab === 0) {
+            <div class="tab-content" [@fadeIn]>
+              <div class="tab-pane active" role="tabpanel">
+                <h4>
+                  {{ 'AbpIdentity::ChangePassword' | abpLocalization }}
+                  <hr />
+                </h4>
+                <abp-change-password-form
+                  *abpReplaceableTemplate="{
+                    componentKey: changePasswordKey
+                  }"
+                ></abp-change-password-form>
+              </div>
+            </div>
+          }
+          @if (selectedTab === 1) {
+            <div class="tab-content" [@fadeIn]>
+              <div class="tab-pane active" role="tabpanel">
+                <h4>
+                  {{ 'AbpIdentity::PersonalSettings' | abpLocalization }}
+                  <hr />
+                </h4>
+                <abp-personal-settings-form
+                  *abpReplaceableTemplate="{
+                    componentKey: personalSettingsKey
+                  }"
+                ></abp-personal-settings-form>
+              </div>
+            </div>
+          }
         </div>
-        <div class="tab-content" *ngIf="selectedTab === 1" [@fadeIn]>
-          <div class="tab-pane active" role="tabpanel">
-            <h4>
-              {{ 'AbpIdentity::PersonalSettings' | abpLocalization }}
-              <hr />
-            </h4>
-            <abp-personal-settings-form
-              *abpReplaceableTemplate="{
-                componentKey: personalSettingsKey
-              }"
-            ></abp-personal-settings-form>
-          </div>
-        </div>
-      </div>
+      }
     </div>
   </div>
 </div>
diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html
index 0dbb5a4ce0..e77bb8f071 100644
--- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.html
@@ -1,12 +1,14 @@
-<form [formGroup]="form"   *ngIf="form"  (ngSubmit)="submit()" validateOnSubmit class="abp-md-form">
-  <abp-extensible-form [selectedRecord]="selected"></abp-extensible-form>
-
-  <abp-button
-    buttonType="submit"
-    iconClass="fa fa-check"
-    buttonClass="btn btn-primary color-white"
-    [loading]="inProgress"
-  >
-    {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button
-  >
-</form>
+@if (form) {
+  <form [formGroup]="form" (ngSubmit)="submit()" validateOnSubmit class="abp-md-form">
+    <abp-extensible-form [selectedRecord]="selected"></abp-extensible-form>
+  
+    <abp-button
+      buttonType="submit"
+      iconClass="fa fa-check"
+      buttonClass="btn btn-primary color-white"
+      [loading]="inProgress"
+    >
+      {{ 'AbpIdentity::Save' | abpLocalization }}</abp-button
+    >
+  </form>
+}
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 33a564003e..efea7c2bcf 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
@@ -5,53 +5,54 @@
     'AbpAccount::Login' | abpLocalization
   }}</a>
 </strong>
-<form
-  *ngIf="isSelfRegistrationEnabled"
-  [formGroup]="form"
-  (ngSubmit)="onSubmit()"
-  validateOnSubmit
-  class="mt-4"
->
-  <div class="mb-3 form-group">
-    <label for="input-user-name" class="form-label">{{
-      'AbpAccount::UserName' | abpLocalization
-    }}</label
-    ><span> * </span
-    ><input
-      autofocus
-      type="text"
-      id="input-user-name"
-      class="form-control"
-      formControlName="username"
-      autocomplete="username"
-    />
-  </div>
-  <div class="mb-3 form-group">
-    <label for="input-email-address" class="form-label">{{
-      'AbpAccount::EmailAddress' | abpLocalization
-    }}</label
-    ><span> * </span
-    ><input type="email" id="input-email-address" class="form-control" formControlName="email" />
-  </div>
-  <div class="mb-3 form-group">
-    <label for="input-password" class="form-label">{{
-      'AbpAccount::Password' | abpLocalization
-    }}</label
-    ><span> * </span
-    ><input
-      type="password"
-      id="input-password"
-      class="form-control"
-      formControlName="password"
-      autocomplete="current-password"
-    />
-  </div>
-  <abp-button
-    [loading]="inProgress"
-    buttonType="submit"
-    name="Action"
-    buttonClass="btn-block btn-lg mt-3 btn btn-primary"
+@if (isSelfRegistrationEnabled) {
+  <form
+    [formGroup]="form"
+    (ngSubmit)="onSubmit()"
+    validateOnSubmit
+    class="mt-4"
   >
-    {{ 'AbpAccount::Register' | abpLocalization }}
-  </abp-button>
-</form>
+    <div class="mb-3 form-group">
+      <label for="input-user-name" class="form-label">{{
+        'AbpAccount::UserName' | abpLocalization
+      }}</label
+      ><span> * </span
+      ><input
+        autofocus
+        type="text"
+        id="input-user-name"
+        class="form-control"
+        formControlName="username"
+        autocomplete="username"
+      />
+    </div>
+    <div class="mb-3 form-group">
+      <label for="input-email-address" class="form-label">{{
+        'AbpAccount::EmailAddress' | abpLocalization
+      }}</label
+      ><span> * </span
+      ><input type="email" id="input-email-address" class="form-control" formControlName="email" />
+    </div>
+    <div class="mb-3 form-group">
+      <label for="input-password" class="form-label">{{
+        'AbpAccount::Password' | abpLocalization
+      }}</label
+      ><span> * </span
+      ><input
+        type="password"
+        id="input-password"
+        class="form-control"
+        formControlName="password"
+        autocomplete="current-password"
+      />
+    </div>
+    <abp-button
+      [loading]="inProgress"
+      buttonType="submit"
+      name="Action"
+      buttonClass="btn-block btn-lg mt-3 btn btn-primary"
+    >
+      {{ 'AbpAccount::Register' | abpLocalization }}
+    </abp-button>
+  </form>
+}
diff --git a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
index 8777254cfd..cfcb5ffdfa 100644
--- a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
@@ -1,46 +1,40 @@
 <h4>{{ 'AbpAccount::ResetPassword' | abpLocalization }}</h4>
 
-<form
-  *ngIf="!isPasswordReset; else passwordResetTemplate"
-  [formGroup]="form"
-  [mapErrorsFn]="mapErrorsFn"
-  (ngSubmit)="onSubmit()"
-  validateOnSubmit
->
-  <p>{{ 'AbpAccount::ResetPassword_Information' | abpLocalization }}</p>
-  <div class="mb-3 form-group">
-    <label for="input-password" class="form-label">{{
-      'AbpAccount::Password' | abpLocalization
-    }}</label
-    ><span> * </span>
-    <input type="password" id="input-password" class="form-control" formControlName="password" />
-  </div>
-  <div class="mb-3 form-group">
-    <label for="input-confirm-password" class="form-label">{{
-      'AbpAccount::ConfirmPassword' | abpLocalization
-    }}</label
-    ><span> * </span>
-    <input
-      type="password"
-      id="input-confirm-password"
-      class="form-control"
-      formControlName="confirmPassword"
-    />
-  </div>
-  <button class="me-2 btn btn-outline-primary" type="button" routerLink="/account/login">
-    {{ 'AbpAccount::Cancel' | abpLocalization }}
-  </button>
-  <abp-button
-    buttonType="submit"
-    buttonClass="me-2 btn btn-primary"
-    [loading]="inProgress"
-    (click)="onSubmit()"
-  >
-    {{ 'AbpAccount::Submit' | abpLocalization }}
-  </abp-button>
-</form>
-
-<ng-template #passwordResetTemplate>
+@if (!isPasswordReset) {
+  <form [formGroup]="form" [mapErrorsFn]="mapErrorsFn" (ngSubmit)="onSubmit()" validateOnSubmit>
+    <p>{{ 'AbpAccount::ResetPassword_Information' | abpLocalization }}</p>
+    <div class="mb-3 form-group">
+      <label for="input-password" class="form-label">{{
+        'AbpAccount::Password' | abpLocalization
+      }}</label
+      ><span> * </span>
+      <input type="password" id="input-password" class="form-control" formControlName="password" />
+    </div>
+    <div class="mb-3 form-group">
+      <label for="input-confirm-password" class="form-label">{{
+        'AbpAccount::ConfirmPassword' | abpLocalization
+      }}</label
+      ><span> * </span>
+      <input
+        type="password"
+        id="input-confirm-password"
+        class="form-control"
+        formControlName="confirmPassword"
+      />
+    </div>
+    <button class="me-2 btn btn-outline-primary" type="button" routerLink="/account/login">
+      {{ 'AbpAccount::Cancel' | abpLocalization }}
+    </button>
+    <abp-button
+      buttonType="submit"
+      buttonClass="me-2 btn btn-primary"
+      [loading]="inProgress"
+      (click)="onSubmit()"
+    >
+      {{ 'AbpAccount::Submit' | abpLocalization }}
+    </abp-button>
+  </form>
+} @else {
   <p>
     {{ 'AbpAccount::YourPasswordIsSuccessfullyReset' | abpLocalization }}
   </p>
@@ -50,4 +44,4 @@
       {{ 'AbpAccount::BackToLogin' | abpLocalization }}
     </button>
   </a>
-</ng-template>
+}