diff --git a/dashboard/src/views/LoginView.vue b/dashboard/src/views/LoginView.vue
index 062ff5717..61f28c54e 100644
--- a/dashboard/src/views/LoginView.vue
+++ b/dashboard/src/views/LoginView.vue
@@ -115,7 +115,7 @@ onMounted(async () => {
         </fieldset>
 
         <div class="actions">
-          <Button id="loginSubmitButton" @click.prevent="onSubmit" :loading="busy">{{ $t('login.signInAction') }}</Button>
+          <Button id="loginSubmitButton" @click="onSubmit" :disabled="busy || (!username || !password)" :loading="busy">{{ $t('login.signInAction') }}</Button>
           <a class="forgot" href="/passwordreset.html">{{ $t('login.resetPasswordAction') }}</a>
         </div>
       </form>
@@ -133,7 +133,7 @@ onMounted(async () => {
         </fieldset>
 
         <div class="actions">
-          <Button id="totpTokenSubmitButton" @click.prevent="onSubmit" :loading="busy">{{ $t('login.signInAction') }}</Button>
+          <Button id="totpTokenSubmitButton" @click="onSubmit" :disabled="busy || !totpToken" :loading="busy">{{ $t('login.signInAction') }}</Button>
         </div>
       </form>
     </div>