diff --git a/lib/tools.js b/lib/tools.js
index cec163bec..1da4ef70e 100644
--- a/lib/tools.js
+++ b/lib/tools.js
@@ -1844,6 +1844,7 @@ uMDwyq9Y+GFLdSZF
 Qmt72SAp9U458OaT
 PlpLZjr4BL0pohCK
 WO98DhF4vrdYWoNN
+0GY3Y69nPMhxmQ0z
 G8IkXqjVdLZwBK/I
 +AZoia19FAsARLE/
 Wp6z04Yho9uWIObC
@@ -1862,10 +1863,6 @@ h7Squx/sKZNkDat0
 //m57pmYUuiv84pZ
 wInk+UccjElRBe8v
 czn1ie17ikAXC0fx
-bp3iCgOwvQyncj1n
-U5YAhY30g8d7nDpu
-JF+qOcL5dIiYUija
-hAso3Wv1mlMIHmOQ
 xV1YkQ3cgw0EpJZ8
 AP9o7PxYTzhDxdZa
 qurB4y++jCni0Bpf
diff --git a/server.js b/server.js
index c09778585..4379cefc6 100644
--- a/server.js
+++ b/server.js
@@ -220,6 +220,7 @@ const NO_ACTIVE_HANDLER_RESP = {
 // check for upgrades once in 8 hours
 const UPGRADE_CHECK_TIMEOUT = 1 * 24 * 3600 * 1000;
 const LICENSE_CHECK_TIMEOUT = 20 * 60 * 1000;
+const MAX_LICENSE_CHECK_DELAY = 30 * 24 * 60 * 60 * 1000;
 
 const licenseInfo = {
     active: false,
@@ -1138,7 +1139,9 @@ let licenseCheckHandler = async opts => {
                     await redis.hdel(`${REDIS_PREFIX}settings`, 'subexp');
                     await redis.hset(`${REDIS_PREFIX}settings`, 'kv', Buffer.from(packageData.version).toString('hex'));
                     if (data.validatedUntil) {
-                        await redis.hset(`${REDIS_PREFIX}settings`, 'ks', new Date(data.validatedUntil).getTime().toString(16));
+                        let validatedUntil = new Date(data.validatedUntil);
+                        let nextCheck = Math.min(now + MAX_LICENSE_CHECK_DELAY, validatedUntil.getTime());
+                        await redis.hset(`${REDIS_PREFIX}settings`, 'ks', new Date(nextCheck).getTime().toString(16));
                     }
                 }
             } catch (err) {
diff --git a/views/templates/index.hbs b/views/templates/index.hbs
index 32c2be1b7..bc7bb55e5 100644
--- a/views/templates/index.hbs
+++ b/views/templates/index.hbs
@@ -173,7 +173,7 @@
             </p>
 
             <pre>$ curl "<span class="cur-base-url" data-origin="">http://127.0.0.1:3000</span>/v1/account/example/submit" \ 
-  -H "Authorization: Bearer <token>" \ 
+  -H "Authorization: Bearer &lt;token&gt;" \ 
   -H "Content-type: application/json" \ 
   -d '{
     &quot;from&quot;: {