diff --git a/static/js/home/dropdown-options.js b/static/js/home/dropdown-options.js
index 6f4d9270e5f1d9bb6f914ebf60a7dc90cfcf109e..e0c600e23622789bc13489dbd8dd7f0390e4b178 100644
--- a/static/js/home/dropdown-options.js
+++ b/static/js/home/dropdown-options.js
@@ -42,10 +42,12 @@ define(["jquery", "home/utils"], function (
     const currentVal = select.val();
 
     resetInputElement(select);
-    $(`#${id}-na-btn`).hide();
-    $(`#${id}-na-info`).empty().hide();
-    if (!window.spawnActive[id])
-      $(`#${id}-start-btn`).removeClass("disabled").show();
+    if ($(`#${id}-na-info`).html().includes("flavor")) {
+      $(`#${id}-na-btn`).hide();
+      $(`#${id}-na-info`).empty().hide();
+      if (!window.spawnActive[id])
+        $(`#${id}-start-btn`).removeClass("disabled").show();
+    }
 
     let systemFlavors = window.flavorInfo[system];
     if (!systemFlavors) {
diff --git a/static/js/home/lab-configs.js b/static/js/home/lab-configs.js
index 26801f7f9e54bd0e2d8548e4906786d275d210b5..7a62823d2b4f695cd1b2d4ce4b93c8f62765ba23 100644
--- a/static/js/home/lab-configs.js
+++ b/static/js/home/lab-configs.js
@@ -61,7 +61,7 @@ define(["jquery", "home/utils", "home/dropdown-options"], function (
         utils.setLabAsNA(id, reason);
         return false;
       }
-      if (!(system in systemInfo)){
+      if (!(system in systemInfo)) {
         reason += "system";
         utils.setLabAsNA(id, reason);
         return false;
@@ -126,7 +126,7 @@ define(["jquery", "home/utils", "home/dropdown-options"], function (
         utils.setLabAsNA(id, reason_broken_lab);
         return false;
       }
-      setFalse = true;
+      let setFalse = true;
       for (const reservation_dict of dropdownOptions[service][system][account][project][partition]) {
         if (reservation == reservation_dict.ReservationName) {
           if (reservation_dict.State == "ACTIVE") {