diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 0e0ce26..cdfdb93 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -5,37 +5,39 @@
         <div class="column is-5-tablet is-5-desktop is-5-widescreen">
           <img src="../../assets/logo.png" />
           <div class="box">
-            <div class="field">
-              <label for="" class="label">Username</label>
-              <div class="control has-icons-left">
-                <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
-                <span class="icon is-small is-left">
-                  <i class="fa fa-envelope"></i>
-                </span>
+            <form (ngSubmit)="login()">
+              <div class="field">
+                <label for="" class="label">Username</label>
+                <div class="control has-icons-left">
+                  <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
+                  <span class="icon is-small is-left">
+                    <i class="fa fa-envelope"></i>
+                  </span>
+                </div>
               </div>
-            </div>
-            <div class="field">
-              <label for="" class="label" name="password">Password</label>
-              <div class="control has-icons-left">
-                <input type="password" class="input" required name="password" [(ngModel)]="password" />
-                <span class="icon is-small is-left">
-                  <i class="fa fa-lock"></i>
-                </span>
+              <div class="field">
+                <label for="" class="label" name="password">Password</label>
+                <div class="control has-icons-left">
+                  <input type="password" class="input" required name="password" [(ngModel)]="password" />
+                  <span class="icon is-small is-left">
+                    <i class="fa fa-lock"></i>
+                  </span>
+                </div>
               </div>
-            </div>
-            <div class="field">
-              <button
-                class="button is-success"
-                (click)="login()"
-                [ngClass]="{ 'is-loading': loggingIn }"
-                [disabled]="loggingIn"
-              >
-                Login
-              </button>
-            </div>
-            <div class="notification is-danger is-light" *ngIf="error?.length > 0">
-              {{ error }}
-            </div>
+              <div class="field">
+                <button
+                  class="button is-success"
+                  type="submit"
+                  [ngClass]="{ 'is-loading': loggingIn }"
+                  [disabled]="loggingIn"
+                >
+                  Login
+                </button>
+              </div>
+              <div class="notification is-danger is-light" *ngIf="error?.length > 0">
+                {{ error }}
+              </div>
+            </form>
           </div>
         </div>
       </div>
diff --git a/client/src/app/setup/setup.component.html b/client/src/app/setup/setup.component.html
index e8f27eb..5f53e35 100644
--- a/client/src/app/setup/setup.component.html
+++ b/client/src/app/setup/setup.component.html
@@ -8,37 +8,38 @@
             <div class="notification is-primary">
               Welcome to RealDebrid Client. Please create your account by entering a username and password.
             </div>
-            <div class="field">
-              <label for="" class="label">Username</label>
-              <div class="control has-icons-left">
-                <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
-                <span class="icon is-small is-left">
-                  <i class="fa fa-envelope"></i>
-                </span>
+            <form (ngSubmit)="setup()">
+              <div class="field">
+                <label for="" class="label">Username</label>
+                <div class="control has-icons-left">
+                  <input type="text" placeholder="" class="input" name="userName" [(ngModel)]="userName" required />
+                  <span class="icon is-small is-left">
+                    <i class="fa fa-envelope"></i>
+                  </span>
+                </div>
               </div>
-            </div>
-            <div class="field">
-              <label for="" class="label" name="password">Password</label>
-              <div class="control has-icons-left">
-                <input type="password" class="input" required name="password" [(ngModel)]="password" />
-                <span class="icon is-small is-left">
-                  <i class="fa fa-lock"></i>
-                </span>
+              <div class="field">
+                <label for="" class="label" name="password">Password</label>
+                <div class="control has-icons-left">
+                  <input type="password" class="input" required name="password" [(ngModel)]="password" />
+                  <span class="icon is-small is-left">
+                    <i class="fa fa-lock"></i>
+                  </span>
+                </div>
               </div>
-            </div>
-            <div class="field">
-              <button
-                class="button is-success"
-                (click)="setup()"
-                [ngClass]="{ 'is-loading': working }"
-                [disabled]="working"
-              >
-                Setup
-              </button>
-            </div>
-            <div class="notification is-danger is-light" *ngIf="error?.length > 0">
-              {{ error }}
-            </div>
+              <div class="field">
+                <button
+                  class="button is-success"
+                  [ngClass]="{ 'is-loading': working }"
+                  [disabled]="working"
+                >
+                  Setup
+                </button>
+              </div>
+              <div class="notification is-danger is-light" *ngIf="error?.length > 0">
+                {{ error }}
+              </div>
+            </form>
           </div>
 
           <div class="box" *ngIf="step === 2">
diff --git a/server/RdtClient.Service/Services/Authentication.cs b/server/RdtClient.Service/Services/Authentication.cs
index acc059f..ada92a7 100644
--- a/server/RdtClient.Service/Services/Authentication.cs
+++ b/server/RdtClient.Service/Services/Authentication.cs
@@ -37,6 +37,11 @@ namespace RdtClient.Service.Services
 
         public async Task<SignInResult> Login(String userName, String password)
         {
+            if (String.IsNullOrWhiteSpace(userName) || String.IsNullOrWhiteSpace(password))
+            {
+                return SignInResult.Failed;
+            }
+
             var result = await _signInManager.PasswordSignInAsync(userName, password, true, false);
 
             return result;