diff --git a/APPL/Shared/logger.inc b/APPL/Shared/logger.inc
index 4db03d54a6..a023907a76 100644
--- a/APPL/Shared/logger.inc
+++ b/APPL/Shared/logger.inc
@@ -276,7 +276,7 @@ function __SafeLog(s, optionalCaller, leave_open)
 {
     if (Session("logging")&1)
     {
-        return __SafeDoLog(s, null, optionalCaller, leave_open)
+        return __SafeDoLog(s, null, optionalCaller||__SafeLog.caller, leave_open)
     }
 }
 
@@ -291,7 +291,7 @@ function __Log(s, optionalCallerOrColor, leave_open)
             var optionalColor = null;
             var optionalCaller = optionalCallerOrColor;
         }
-        return __DoLog(s, optionalColor, optionalCaller, leave_open)
+        return __DoLog(s, optionalColor, optionalCaller||__Log.caller, leave_open)
     }
 }
 
@@ -328,7 +328,7 @@ function __DoLog(s, optionalColor, optionalCaller, leave_open)
     }
     else
         s = Server.HTMLEncode(String(s)).replace(/\n/g, "<br>");
-    __SafeDoLog(s, optionalColor, optionalCaller, leave_open);
+    __SafeDoLog(s, optionalColor, optionalCaller||__DoLog.caller, leave_open);
 }
 
 // Veronderstel dat s HTML-safe is
@@ -338,7 +338,7 @@ function __SafeDoLog(s, optionalColor, optionalCaller, leave_open)
         return;
     try
     {
-        return theLogger.log_tekst(String(s), optionalColor, __callerTekst(optionalCaller||__Log.caller), leave_open)
+        return theLogger.log_tekst(String(s), optionalColor, __callerTekst(optionalCaller||__SafeDoLog.caller), leave_open)
     }
     catch(e)
     {  // Waarschijnlijk een permission denied omdat twee processen tegelijk proberen te schrijven