diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
index 6335575a8..52e91a811 100644
--- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
+++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html
@@ -8,10 +8,11 @@
             <div class="content-container full-height">
                 <div class="overlay-shadow"></div>
                 <div [ngClass]="!isWarningsScreen && 'dialog'">
-                    <div *ngIf="!isWarningsScreen" class="dialog-header">
-                        <div class="heading-l" [translate]="translations[path]"></div>
-                    </div>
-
+                    @if (!isWarningsScreen) {
+                        <div class="dialog-header">
+                            <div class="heading-l" [translate]="translations[path]"></div>
+                        </div>
+                    }
                     <router-outlet></router-outlet>
                 </div>
             </div>
diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.html b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.html
index 6c7e7b9aa..bb2764e20 100644
--- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.html
+++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.html
@@ -16,14 +16,16 @@
                 <input formControlName="lastName" name="lastName" type="text" />
             </div>
 
-            <div *ngIf="devMode" class="iqser-input-group">
+            <div class="iqser-input-group">
                 <label [translate]="'top-bar.navigation-items.my-account.children.language.label'"></label>
                 <mat-form-field>
                     <mat-select formControlName="language">
                         <mat-select-trigger>{{ languageSelectLabel() | translate }}</mat-select-trigger>
-                        <mat-option *ngFor="let language of languages" [value]="language">
-                            {{ translations[language] | translate }}
-                        </mat-option>
+                        @for (language of languages; track language) {
+                            <mat-option [value]="language">
+                                {{ translations[language] | translate }}
+                            </mat-option>
+                        }
                     </mat-select>
                 </mat-form-field>
             </div>
@@ -32,11 +34,13 @@
                 <a (click)="resetPassword()" target="_blank"> {{ 'user-profile-screen.actions.change-password' | translate }}</a>
             </div>
 
-            <div *ngIf="devMode" class="iqser-input-group">
-                <mat-slide-toggle color="primary" formControlName="darkTheme">
-                    {{ 'user-profile-screen.form.dark-theme' | translate }}
-                </mat-slide-toggle>
-            </div>
+            @if (devMode) {
+                <div class="iqser-input-group">
+                    <mat-slide-toggle color="primary" formControlName="darkTheme">
+                        {{ 'user-profile-screen.form.dark-theme' | translate }}
+                    </mat-slide-toggle>
+                </div>
+            }
         </div>
     </div>