diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html
index 0dd55827ca..b919f085f5 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@@ -46,86 +46,75 @@
     <div class="col">
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-content>
-          @if (isLoading) {
-            <ngx-skeleton-loader
-              animation="pulse"
-              class="my-3"
-              [theme]="{
-                height: '1.5rem',
-                width: '100%'
-              }"
-            />
-          } @else {
+          <div class="d-flex my-3">
+            <div class="w-50" i18n>User Signup</div>
+            <div class="w-50">
+              <mat-slide-toggle
+                color="primary"
+                hideIcon="true"
+                [checked]="isUserSignupEnabled"
+                [disabled]="isLoading"
+                (change)="onEnableUserSignupModeChange($event)"
+              />
+            </div>
+          </div>
+          @if (hasPermissionToToggleReadOnlyMode) {
             <div class="d-flex my-3">
-              <div class="w-50" i18n>User Signup</div>
+              <div class="w-50" i18n>Read-only Mode</div>
               <div class="w-50">
                 <mat-slide-toggle
                   color="primary"
                   hideIcon="true"
-                  [checked]="isUserSignupEnabled"
-                  (change)="onEnableUserSignupModeChange($event)"
+                  [checked]="isReadOnlyMode"
+                  [disabled]="isLoading"
+                  (change)="onReadOnlyModeChange($event)"
                 />
               </div>
             </div>
-            @if (hasPermissionToToggleReadOnlyMode) {
-              <div class="d-flex my-3">
-                <div class="w-50" i18n>Read-only Mode</div>
-                <div class="w-50">
-                  <mat-slide-toggle
-                    color="primary"
-                    hideIcon="true"
-                    [checked]="isReadOnlyMode"
-                    (change)="onReadOnlyModeChange($event)"
-                  />
-                </div>
-              </div>
-            }
+          }
+          <div class="d-flex my-3">
+            <div class="w-50" i18n>Data Gathering</div>
+            <div class="w-50">
+              <mat-slide-toggle
+                color="primary"
+                hideIcon="true"
+                [checked]="isDataGatheringEnabled"
+                [disabled]="isLoading"
+                (change)="onEnableDataGatheringChange($event)"
+              />
+            </div>
+          </div>
+          @if (hasPermissionForSystemMessage) {
             <div class="d-flex my-3">
-              <div class="w-50" i18n>Data Gathering</div>
+              <div class="w-50" i18n>System Message</div>
               <div class="w-50">
-                <mat-slide-toggle
-                  color="primary"
-                  hideIcon="true"
-                  [checked]="isDataGatheringEnabled"
-                  (change)="onEnableDataGatheringChange($event)"
-                />
-              </div>
-            </div>
-            @if (hasPermissionForSystemMessage) {
-              <div class="d-flex my-3">
-                <div class="w-50" i18n>System Message</div>
-                <div class="w-50">
-                  @if (systemMessage) {
-                    <div class="align-items-center d-flex">
-                      <div class="text-truncate">
-                        {{ systemMessage | json }}
-                      </div>
-                      <button
-                        class="h-100 mx-1 no-min-width px-2"
-                        mat-button
-                        (click)="onDeleteSystemMessage()"
-                      >
-                        <ion-icon name="trash-outline" />
-                      </button>
+                @if (systemMessage) {
+                  <div class="align-items-center d-flex">
+                    <div class="text-truncate">
+                      {{ systemMessage | json }}
                     </div>
-                  }
-                  @if (!systemMessage) {
                     <button
-                      class="mt-2"
-                      color="accent"
-                      mat-flat-button
-                      (click)="onSetSystemMessage()"
+                      class="h-100 mx-1 no-min-width px-2"
+                      mat-button
+                      (click)="onDeleteSystemMessage()"
                     >
-                      <ion-icon
-                        class="mr-1"
-                        name="information-circle-outline"
-                      />
-                      <span i18n>Set Message</span>
+                      <ion-icon name="trash-outline" />
                     </button>
-                  }
-                </div>
+                  </div>
+                }
+                @if (!systemMessage) {
+                  <button
+                    class="mt-2"
+                    color="accent"
+                    mat-flat-button
+                    (click)="onSetSystemMessage()"
+                  >
+                    <ion-icon class="mr-1" name="information-circle-outline" />
+                    <span i18n>Set Message</span>
+                  </button>
+                }
               </div>
-            }
+            </div>
           }
           <div class="d-flex my-3">
             <div class="w-50" i18n>Housekeeping</div>