diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 9a8689dc9cc..523fb8b6586 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -156,6 +156,12 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		emailStates: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
 	},
 
 	data() {
@@ -207,6 +213,15 @@ export default {
 		loginActionUrl() {
 			return generateUrl('login')
 		},
+		emailEnabled() {
+			return this.emailStates ? this.emailStates.every((state) => state === '1') : 1
+		},
+		loginText() {
+			if (this.emailEnabled) {
+				return t('core', 'Login with username or email')
+			}
+			return t('core', 'Login with username')
+		},
 	},
 
 	mounted() {
diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue
index 643cf66c07b..4c5d256109f 100644
--- a/core/src/views/Login.vue
+++ b/core/src/views/Login.vue
@@ -32,6 +32,7 @@
 						:errors="errors"
 						:throttle-delay="throttleDelay"
 						:auto-complete-allowed="autoCompleteAllowed"
+						:email-states="emailStates"
 						@submit="loading = true" />
 					<a v-if="canResetPassword && resetPasswordLink !== ''"
 						id="lost-password"
@@ -179,6 +180,7 @@ export default {
 			isLocalhost: window.location.hostname === 'localhost',
 			hasPublicKeyCredential: typeof (window.PublicKeyCredential) !== 'undefined',
 			hideLoginForm: loadState('core', 'hideLoginForm', false),
+			emailStates: loadState('core', 'emailStates', []),
 		}
 	},