diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index 917612c882..3bb4e7e512 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -95,7 +95,7 @@ class CmdBoot(COMMAND_DEFAULT_CLASS):
         for session in boot_list:
             session.msg(feedback)
             session.account.disconnect_session_from_account(session)
-            
+
         if pobj and boot_list:
             logger.log_sec('Booted: %s (Reason: %s, Caller: %s, IP: %s).' % (pobj, reason, caller, self.session.address))
 
@@ -435,9 +435,9 @@ class CmdNewPassword(COMMAND_DEFAULT_CLASS):
         account = caller.search_account(self.lhs)
         if not account:
             return
-        
+
         newpass = self.rhs
-        
+
         # Validate password
         validated, error = account.validate_password(newpass)
         if not validated:
@@ -445,7 +445,7 @@ class CmdNewPassword(COMMAND_DEFAULT_CLASS):
             string = "\n".join(errors)
             caller.msg(string)
             return
-        
+
         account.set_password(newpass)
         account.save()
         self.msg("%s - new password set to '%s'." % (account.name, newpass))
@@ -557,7 +557,7 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
                     target_result.append("\n%s gives you (%s, %s) the permission '%s'."
                                          % (caller.name, obj.name, plystring, perm))
                     logger.log_sec('Permissions Added: %s, %s (Caller: %s, IP: %s).' % (obj, perm, caller, self.session.address))
-                    
+
         caller.msg("".join(caller_result).strip())
         if target_result:
             obj.msg("".join(target_result).strip())
diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py
index 90ef0a0086..7abde75492 100644
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@@ -434,7 +434,8 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
         # disconnect account
         channel.disconnect(account)
         CHANNELHANDLER.update()
-        logger.log_sec('Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s).' % (account, channel, reason, caller, self.session.address))
+        logger.log_sec('Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s).' % (
+            account, channel, reason, self.caller, self.session.address))
 
 
 class CmdCemit(COMMAND_DEFAULT_CLASS):