diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 9fa583c57..8848d41eb 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -89,6 +89,7 @@
 						@click="submit"
 						:loading="loading"
 						tabindex="4"
+						:disabled="!allFieldsValid"
 					>
 						{{ $t('user.auth.login') }}
 					</x-button>
@@ -186,6 +187,9 @@ export default {
 				this.openidConnect.providers &&
 				this.openidConnect.providers.length > 0
 		},
+		allFieldsValid() {
+			return this.usernameValid && this.passwordValid
+		},
 		...mapState({
 			registrationEnabled: state => state.config.registrationEnabled,
 			loading: LOADING,