diff --git a/functions.inc.php b/functions.inc.php
index e9e356b2..95aab4f2 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -27,6 +27,11 @@ $version = '2.4 develop';
 function authentication_get_username()
 {
     global $CONF;
+
+    if (defined('POSTFIXADMIN_CLI')) {
+        return 'CLI';
+    }
+
     if (!isset($_SESSION['sessid'])) {
         header ("Location: " . $CONF['postfix_admin_url'] . "/login.php");
         exit(0);
@@ -1828,6 +1833,8 @@ function db_log ($username,$domain,$action,$data)
     global $table_log;
     $REMOTE_ADDR = getRemoteAddr();
 
+    $username = authentication_get_username();
+
     $action_list = array(  
         'create_alias', 'edit_alias', 'edit_alias_state', 'delete_alias',
         'create_mailbox', 'edit_mailbox', 'edit_mailbox_state', 'delete_mailbox',
diff --git a/scripts/postfixadmin-cli.php b/scripts/postfixadmin-cli.php
index c7f80de7..76b1d89e 100644
--- a/scripts/postfixadmin-cli.php
+++ b/scripts/postfixadmin-cli.php
@@ -557,6 +557,7 @@ class PostfixAdmin {
 }
 
 
+define ("POSTFIXADMIN_CLI", 1);
 
 $dispatcher = new PostfixAdmin($argv);