diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
index a42ee933b4..8592070eec 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@@ -243,7 +243,7 @@ export class GfAdminMarketDataComponent implements AfterViewInit, OnInit {
       .subscribe((filters) => {
         this.activeFilters = filters;
 
-        this.loadData();
+        this.reloadData({ pageIndex: 0 });
       });
 
     addIcons({
@@ -293,7 +293,7 @@ export class GfAdminMarketDataComponent implements AfterViewInit, OnInit {
       .deleteAssetProfile({ dataSource, symbol })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(() => {
-        this.loadData();
+        this.reloadData();
       });
   }
 
@@ -306,7 +306,7 @@ export class GfAdminMarketDataComponent implements AfterViewInit, OnInit {
       )
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(() => {
-        this.loadData();
+        this.reloadData();
       });
   }
 
@@ -453,11 +453,7 @@ export class GfAdminMarketDataComponent implements AfterViewInit, OnInit {
             if (newAssetProfileIdentifier) {
               this.onOpenAssetProfileDialog(newAssetProfileIdentifier);
             } else {
-              this.loadData({
-                pageIndex: this.paginator().pageIndex,
-                sortColumn: this.sort().active,
-                sortDirection: this.sort().direction
-              });
+              this.reloadData();
 
               this.router.navigate(['.'], { relativeTo: this.route });
             }
@@ -511,4 +507,14 @@ export class GfAdminMarketDataComponent implements AfterViewInit, OnInit {
           });
       });
   }
+
+  private reloadData({
+    pageIndex = this.paginator().pageIndex
+  }: { pageIndex?: number } = {}) {
+    this.loadData({
+      pageIndex,
+      sortColumn: this.sort().active,
+      sortDirection: this.sort().direction
+    });
+  }
 }
diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
index ac4cf05fe7..733200c912 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@@ -64,7 +64,7 @@ import {
 } from 'ionicons/icons';
 import ms, { StringValue } from 'ms';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-import { switchMap } from 'rxjs';
+import { catchError, of, switchMap } from 'rxjs';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -390,6 +390,10 @@ export class GfAdminOverviewComponent implements OnInit {
         switchMap(() => {
           return this.userService.get(true);
         }),
+        catchError(() => {
+          // Refresh anyway to reflect the actual state of the settings
+          return of(undefined);
+        }),
         takeUntilDestroyed(this.destroyRef)
       )
       .subscribe(() => {
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 75092b943b..0dd55827ca 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@@ -46,70 +46,86 @@
     <div class="col">
       <mat-card appearance="outlined" class="mb-3">
         <mat-card-content>
-          <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"
-                (change)="onEnableUserSignupModeChange($event)"
-              />
-            </div>
-          </div>
-          @if (hasPermissionToToggleReadOnlyMode) {
+          @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>Read-only Mode</div>
+              <div class="w-50" i18n>User Signup</div>
               <div class="w-50">
                 <mat-slide-toggle
                   color="primary"
                   hideIcon="true"
-                  [checked]="isReadOnlyMode"
-                  (change)="onReadOnlyModeChange($event)"
+                  [checked]="isUserSignupEnabled"
+                  (change)="onEnableUserSignupModeChange($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"
-                (change)="onEnableDataGatheringChange($event)"
-              />
-            </div>
-          </div>
-          @if (hasPermissionForSystemMessage) {
+            @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>System Message</div>
+              <div class="w-50" i18n>Data Gathering</div>
               <div class="w-50">
-                @if (systemMessage) {
-                  <div class="align-items-center d-flex">
-                    <div class="text-truncate">{{ systemMessage | json }}</div>
+                <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>
+                    </div>
+                  }
+                  @if (!systemMessage) {
                     <button
-                      class="h-100 mx-1 no-min-width px-2"
-                      mat-button
-                      (click)="onDeleteSystemMessage()"
+                      class="mt-2"
+                      color="accent"
+                      mat-flat-button
+                      (click)="onSetSystemMessage()"
                     >
-                      <ion-icon name="trash-outline" />
+                      <ion-icon
+                        class="mr-1"
+                        name="information-circle-outline"
+                      />
+                      <span i18n>Set Message</span>
                     </button>
-                  </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>
+            }
           }
           <div class="d-flex my-3">
             <div class="w-50" i18n>Housekeeping</div>
diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts b/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts
index 35aaa9e8ac..defe751ee8 100644
--- a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts
+++ b/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts
@@ -173,6 +173,9 @@ export class GfUserAccountMembershipComponent {
           this.dataService
             .redeemCoupon(couponCode)
             .pipe(
+              switchMap(() => {
+                return this.userService.get(true);
+              }),
               catchError(() => {
                 this.snackBar.open(
                   '😞 ' + $localize`Could not redeem coupon code`,
@@ -184,9 +187,6 @@ export class GfUserAccountMembershipComponent {
 
                 return EMPTY;
               }),
-              switchMap(() => {
-                return this.userService.get(true);
-              }),
               takeUntilDestroyed(this.destroyRef)
             )
             .subscribe(() => {