diff --git a/packages/frontend/editor-ui/src/init.ts b/packages/frontend/editor-ui/src/init.ts
index 82a0cef3a1..de471dd80e 100644
--- a/packages/frontend/editor-ui/src/init.ts
+++ b/packages/frontend/editor-ui/src/init.ts
@@ -205,12 +205,14 @@ function registerAuthenticationHooks() {
 	const npsSurveyStore = useNpsSurveyStore();
 	const telemetry = useTelemetry();
 	const RBACStore = useRBACStore();
+	const settingsStore = useSettingsStore();
 
 	usersStore.registerLoginHook((user) => {
 		RBACStore.setGlobalScopes(user.globalScopes ?? []);
 		telemetry.identify(rootStore.instanceId, user.id);
 		postHogStore.init(user.featureFlags);
 		npsSurveyStore.setupNpsSurveyOnLogin(user.id, user.settings);
+		void settingsStore.getModuleSettings();
 	});
 
 	usersStore.registerLogoutHook(() => {
diff --git a/packages/frontend/editor-ui/src/stores/settings.store.ts b/packages/frontend/editor-ui/src/stores/settings.store.ts
index 8ee24fdbce..2ee1cdb631 100644
--- a/packages/frontend/editor-ui/src/stores/settings.store.ts
+++ b/packages/frontend/editor-ui/src/stores/settings.store.ts
@@ -279,8 +279,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		await getSettings();
 
 		initialized.value = true;
-
-		await getModuleSettings();
 	};
 
 	const stopShowingSetupPage = () => {
diff --git a/packages/frontend/editor-ui/src/views/SigninView.vue b/packages/frontend/editor-ui/src/views/SigninView.vue
index 7cfaa68679..0fce02a25e 100644
--- a/packages/frontend/editor-ui/src/views/SigninView.vue
+++ b/packages/frontend/editor-ui/src/views/SigninView.vue
@@ -136,10 +136,6 @@ const login = async (form: LoginRequestDto) => {
 		loading.value = false;
 		await settingsStore.getSettings();
 
-		if (settingsStore.activeModules.length > 0) {
-			await settingsStore.getModuleSettings();
-		}
-
 		toast.clearAllStickyNotifications();
 
 		if (settingsStore.isMFAEnforced && !usersStore.currentUser?.mfaAuthenticated) {