diff --git a/server/src/modules/organization-themes/constants/feature.ts b/server/src/modules/organization-themes/constants/feature.ts
index 0fa5e3dfd3..25b8274fa4 100644
--- a/server/src/modules/organization-themes/constants/feature.ts
+++ b/server/src/modules/organization-themes/constants/feature.ts
@@ -7,7 +7,7 @@ export const FEATURES: FeaturesConfig = {
   [MODULES.ORGANIZATION_THEMES]: {
     [FEATURE_KEY.THEMES_CREATE]: { license: LICENSE_FIELD.CUSTOM_THEMES },
     [FEATURE_KEY.THEMES_DELETE]: { license: LICENSE_FIELD.CUSTOM_THEMES },
-    [FEATURE_KEY.THEMES_GET_ALL]: { license: LICENSE_FIELD.CUSTOM_THEMES },
+    [FEATURE_KEY.THEMES_GET_ALL]: {},
     [FEATURE_KEY.THEMES_UPDATE_DEFAULT]: { license: LICENSE_FIELD.CUSTOM_THEMES },
     [FEATURE_KEY.THEMES_UPDATE_DEFINITION]: { license: LICENSE_FIELD.CUSTOM_THEMES },
     [FEATURE_KEY.THEMES_UPDATE_NAME]: { license: LICENSE_FIELD.CUSTOM_THEMES },
diff --git a/server/src/modules/users/repository.ts b/server/src/modules/users/repository.ts
index 2771eb5d9b..0a4f77902a 100644
--- a/server/src/modules/users/repository.ts
+++ b/server/src/modules/users/repository.ts
@@ -65,6 +65,7 @@ export class UserRepository extends Repository<User> {
           organizationId: true,
           organization: {
             name: true,
+            status: true,
           },
         },
       },