diff --git a/client_logins.php b/client_logins.php
index 83acddc07..6f2636508 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -44,7 +44,7 @@
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-key mr-2"></i>Credentials</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
                     <i class="fas fa-plus mr-2"></i>New Credential
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
diff --git a/login.php b/login.php
index 7bdda3670..edfeef333 100644
--- a/login.php
+++ b/login.php
@@ -145,7 +145,7 @@
         }
 
         // Validate MFA code
-        if (TokenAuth6238::verify($token, $current_code)) {
+        if (!empty($current_code) && TokenAuth6238::verify($token, $current_code)) {
             $mfa_is_complete = true;
             $extended_log = 'with 2FA';
         }