diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index a12cb6112..4fe654a96 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -565,7 +565,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         """
         # A basic security setup
         lockstring = "examine:perm(Admin);edit:perm(Admin);" \
-                     "delete:perm(Admin);boot:perm(Admin);msg:all()"
+                     "delete:perm(Admin);boot:perm(Admin);msg:all();" \
+                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
         self.locks.add(lockstring)
 
         # The ooc account cmdset
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 18b1220c4..e8fb111a1 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -133,7 +133,7 @@ def _server_maintenance():
     for session in (sess for sess in SESSIONS.values()
                     if (now - sess.cmd_last) > _IDLE_TIMEOUT):
         if not session.account or not \
-                session.account.access(session.account, "no_idle_disconnect", default=False):
+                session.account.access(session.account, "noidletimeout", default=False):
             SESSIONS.disconnect(session, reason=reason)
 
     # Commenting this out, it is probably not needed