diff --git a/server/auth.js b/server/auth.js
index f2c59d66f..99084d164 100644
--- a/server/auth.js
+++ b/server/auth.js
@@ -47,14 +47,16 @@ async function validateAPIKey(key) {
 
     let index = key.substring(0, key.indexOf("-"));
     let clear = key.substring(key.indexOf("-") + 1, key.length);
-    console.log(index);
-    console.log(clear);
 
     let hash = await R.findOne("api_key", " id=? ", [ index ]);
 
+    if (hash === null) {
+        return false;
+    }
+
     let current = dayjs();
     let expiry = dayjs(hash.expires);
-    if (expiry.diff(current) < 0, !hash.active) {
+    if (expiry.diff(current) < 0 || !hash.active) {
         return false;
     }
 
diff --git a/src/lang/en.json b/src/lang/en.json
index 2dc487cb4..007d8072e 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -711,5 +711,6 @@
     "apiKey-inactive": "Inactive",
     "Expires": "Expires",
     "disableAPIKeyMsg": "Are you sure you want to disable this API key?",
-    "deleteAPIKeyMsg": "Are you sure you want to delete this API key?"
+    "deleteAPIKeyMsg": "Are you sure you want to delete this API key?",
+    "Generate": "Generate"
 }
diff --git a/src/pages/AddAPIKey.vue b/src/pages/AddAPIKey.vue
index a2e4434e5..e6b602335 100644
--- a/src/pages/AddAPIKey.vue
+++ b/src/pages/AddAPIKey.vue
@@ -28,6 +28,7 @@
                                     format="yyyy-MM-dd HH:mm"
                                     modelType="yyyy-MM-dd HH:mm:ss"
                                     :required="!noExpire"
+                                    :disabled="noExpire"
                                 />
 
                                 <div class="form-check mb-2">
@@ -46,7 +47,7 @@
                                     id="monitor-submit-btn" class="btn btn-primary" type="submit"
                                     :disabled="processing"
                                 >
-                                    {{ $t("Save") }}
+                                    {{ $t("Generate") }}
                                 </button>
                             </div>
                         </div>