diff --git a/catalog/templates/common_libs.html b/catalog/templates/common_libs.html
index 503b2ebd..5d70b30d 100644
--- a/catalog/templates/common_libs.html
+++ b/catalog/templates/common_libs.html
@@ -22,7 +22,7 @@
   };
 </script>
 <script src="https://cdn.staticfile.org/htmx/1.9.2/htmx.min.js"></script>
-<script src="{% static 'lib/js/hyperscript-0.9.7.min.js' %}"></script>
+<script src="https://unpkg.com/hyperscript.org@0.9.5"></script>
 <link rel="stylesheet"
       href="https://unpkg.com/@picocss/pico@2.0.0-alpha1/css/pico.min.css" />
 <link href="{% sass_src 'scss/neodb.scss' %}"
diff --git a/users/templates/users/login.html b/users/templates/users/login.html
index 651af5d3..7ee24e2a 100644
--- a/users/templates/users/login.html
+++ b/users/templates/users/login.html
@@ -18,7 +18,12 @@
     <script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
     {% include "common_libs.html" with jquery=0 v2=1 %}
     <script src="https://cdn.staticfile.org/js-cookie/3.0.1/js.cookie.min.js"></script>
-    <script> $(document).ready(function () { $('.delayed').remove(); $('#loginButton').prop("disabled", false); }); </script>
+    <script>
+    $(document).ready(function () {
+      if (!window.htmx || !window._hyperscript) return; // disable login if cash, htmx or hyperscript not loaded
+      $('.delayed').remove(); $('#loginButton').prop("disabled", false);
+    });
+    </script>
     <style type="text/css">
     .delayed {
       animation: 10s _fadeIn;