diff --git a/frontend/index.html b/frontend/index.html
index 9385a2d..4eb9bda 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -812,7 +812,14 @@ <h2 data-i18n="contact">Contact</h2>
         console.log("Dynamic Config result is", data);
 
         //create token and token url
-        OPCODE_AUTOGEN = data.opcode?.autogen || data.intro.program_or_study == "study";
+        if(typeof data.opcode?.autogen !== 'undefined') { //if the autogen property is set, use it
+          console.log("found opcode setting, is", data.opcode.autogen);
+          OPCODE_AUTOGEN = data.opcode?.autogen;
+        } else { //else fall back to program vs study
+          console.log("falling back to program vs study", data.intro.program_or_study);
+          OPCODE_AUTOGEN = data.intro.program_or_study == "study";
+        }
+
         if (OPCODE_AUTOGEN) {
           validateAndGenerateToken();
         } else {