diff --git a/meshuser.js b/meshuser.js
index 74d3fd07..aeed7142 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -601,8 +601,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
             }
             if (typeof domain.userconsentflags == 'number') { serverinfo.consent = domain.userconsentflags; }
             if ((typeof domain.usersessionidletimeout == 'number') && (domain.usersessionidletimeout > 0)) {serverinfo.timeout = (domain.usersessionidletimeout * 60 * 1000); }
-            if (typeof domain.logoutOnIdleSessionTimeout == 'boolean') {
-                serverinfo.logoutOnIdleSessionTimeout = domain.logoutOnIdleSessionTimeout;
+            if (typeof domain.logoutonidlesessiontimeout == 'boolean') {
+                serverinfo.logoutOnIdleSessionTimeout = domain.logoutonidlesessiontimeout;
             } else {
                 // Default
                 serverinfo.logoutOnIdleSessionTimeout = true;
diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 4b8d13cd..b86a4472 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -1524,8 +1524,12 @@
         function setSessionActivity() { sessionActivity = Date.now(); }
         function checkIdleSessionTimeout() {
             var delta = (Date.now() - sessionActivity);
-            if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
-                window.location.href = 'logout';
+            if (delta > serverinfo.timeout) {
+                if (serverinfo.logoutOnIdleSessionTimeout) {
+                    window.location.href = 'logout';
+                } else {
+                    setSessionActivity();
+                }
             }
         }
 
diff --git a/views/default.handlebars b/views/default.handlebars
index 61842155..7963ee24 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2449,6 +2449,8 @@
                 }
                 if (serverinfo.logoutOnIdleSessionTimeout) {
                     window.location.href = 'logout';
+                } else {
+                    setSessionActivity();
                 }
             } else {
                 var ds = Math.round((serverinfo.timeout - delta) / 1000);
diff --git a/views/default3.handlebars b/views/default3.handlebars
index 771b6048..3d9449c3 100644
--- a/views/default3.handlebars
+++ b/views/default3.handlebars
@@ -2899,6 +2899,8 @@
                 }
                 if (serverinfo.logoutOnIdleSessionTimeout) {
                     window.location.href = 'logout';
+                } else {
+                    setSessionActivity();
                 }
             } else {
                 var ds = Math.round((serverinfo.timeout - delta) / 1000);
diff --git a/views/sharing-mobile.handlebars b/views/sharing-mobile.handlebars
index 6973c3df..13dd3dc3 100644
--- a/views/sharing-mobile.handlebars
+++ b/views/sharing-mobile.handlebars
@@ -822,8 +822,12 @@
         function setSessionActivity() { sessionActivity = Date.now(); }
         function checkIdleSessionTimeout() {
             var delta = (Date.now() - sessionActivity);
-            if (delta > serverinfo.timeout && serverinfo.logoutOnIdleSessionTimeout) {
-                window.location.href = 'logout';
+            if (delta > serverinfo.timeout) {
+                if (serverinfo.logoutOnIdleSessionTimeout) {
+                    window.location.href = 'logout';
+                } else {
+                    setSessionActivity();
+                }
             }
         }