diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
index 8b30d4b88..573119a22 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
@@ -16,11 +16,11 @@
             Your have reached the maximum number of backups: 10.
         </div>
 
-        <div class="table-items-row table-items-row-empty" *ngIf="backups && backups.length === 0">
+        <div class="table-items-row table-items-row-empty" *ngIf="backups.length === 0">
             No backups created yet.
         </div>
         
-        <div class="table-items-row" *ngFor="let backup of backups; trackBy: trackBy">
+        <div class="table-items-row" *ngFor="let backup of backups; trackBy: trackByBackup">
             <div class="row no-gutter">
                 <div class="col col-auto">
                     <div *ngIf="!backup.stopped" class="backup-status backup-status-pending spin">
@@ -67,7 +67,9 @@
                     </div>
                 </div>
                 <div class="col col-auto">
-                    <button type="button" class="btn btn-link btn-danger" (sqxConfirmClick)="deleteBackup(backup)" confirmTitle="Delete backup"
+                    <button type="button" class="btn btn-link btn-danger" 
+                        (sqxConfirmClick)="deleteBackup(backup)" 
+                        confirmTitle="Delete backup"
                         confirmText="Do you really want to delete the backup?">
                         <i class="icon-bin2"></i>
                     </button>
diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
index affda3829..9ab21fdab 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
@@ -76,7 +76,7 @@ export class BackupsPageComponent implements OnInit, OnDestroy {
         return Duration.create(backup.started, backup.stopped!);
     }
 
-    public trackBy(index: number, item: BackupDto) {
+    public trackByBackup(index: number, item: BackupDto) {
         return item.id;
     }
 }
diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
index 48db8faf7..cde292f8b 100644
--- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
@@ -10,12 +10,13 @@
             No client created yet.
         </div>
 
-        <div *ngFor="let client of appClients?.clients">
-            <sqx-client [client]="client"
+        <ng-container *ngIf="appClients">
+            <sqx-client *ngFor="let client of appClients.clients" [client]="client"
                 (updating)="updateClient(client, $event)"
                 (renaming)="renameClient(client, $event)" 
-                (revoking)="revokeClient(client)"></sqx-client>
-        </div>
+                (revoking)="revokeClient(client)">
+            </sqx-client>
+        </ng-container>
 
         <div class="table-items-footer" *ngIf="appClients">
             <form [formGroup]="addClientForm" (ngSubmit)="attachClient()">