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 5d4e5268e..ff55bb2bc 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
@@ -8,7 +8,10 @@ import {
   PROPERTY_SYSTEM_MESSAGE,
   ghostfolioPrefix
 } from '@ghostfolio/common/config';
-import { ConfirmationDialogType } from '@ghostfolio/common/enums';
+import {
+  ConfirmationDialogType,
+  SubscriptionType
+} from '@ghostfolio/common/enums';
 import { getDateFnsLocale } from '@ghostfolio/common/helper';
 import {
   Coupon,
@@ -255,7 +258,7 @@ export class GfAdminOverviewComponent implements OnInit {
         this.systemMessage ??
           ({
             message: '⚒️ Scheduled maintenance in progress...',
-            targetGroups: ['Basic', 'Premium']
+            targetGroups: [SubscriptionType.Basic, SubscriptionType.Premium]
           } as SystemMessage)
       )
     );
diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
index 2f7568982..7b5b10c7d 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
@@ -1,5 +1,6 @@
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { SubscriptionType } from '@ghostfolio/common/enums';
 import {
   FireCalculationCompleteEvent,
   FireWealth,
@@ -80,7 +81,7 @@ export class GfFirePageComponent implements OnInit {
               : 0
           }
         };
-        if (this.user.subscription?.type === 'Basic') {
+        if (this.user.subscription?.type === SubscriptionType.Basic) {
           this.fireWealth = {
             today: {
               valueInBaseCurrency: 10000
@@ -113,7 +114,7 @@ export class GfFirePageComponent implements OnInit {
           this.user = state.user;
 
           this.hasPermissionToUpdateUserSettings =
-            this.user.subscription?.type === 'Basic'
+            this.user.subscription?.type === SubscriptionType.Basic
               ? false
               : hasPermission(
                   this.user.permissions,
diff --git a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts
index e97fd4876..650522896 100644
--- a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts
@@ -2,6 +2,7 @@ import { GfRulesComponent } from '@ghostfolio/client/components/rules/rules.comp
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { UpdateUserSettingDto } from '@ghostfolio/common/dtos';
+import { SubscriptionType } from '@ghostfolio/common/enums';
 import {
   PortfolioReportResponse,
   PortfolioReportRule
@@ -73,7 +74,7 @@ export class GfXRayPageComponent {
           this.user = state.user;
 
           this.hasPermissionToUpdateUserSettings =
-            this.user.subscription?.type === 'Basic'
+            this.user.subscription?.type === SubscriptionType.Basic
               ? false
               : hasPermission(
                   this.user.permissions,