diff --git a/src/debops/cli.py b/src/debops/cli.py
index f805a126d0..d6aba94760 100644
--- a/src/debops/cli.py
+++ b/src/debops/cli.py
@@ -10,6 +10,7 @@
 from .ansibleplaybookrunner import AnsiblePlaybookRunner
 from .envrunner import EnvRunner
 import logging
+import getpass
 import sys
 import os
 
@@ -23,7 +24,7 @@ def __init__(self, args=None):
         self.config = Configuration()
         self.parsed_args = Subcommands(self.args)
         logger.debug('Command line interpreter initialized')
-        logger.debug('Control user=' + os.getlogin())
+        logger.debug('Control user=' + getpass.getuser())
 
         if self.parsed_args.section == 'project':
             if self.parsed_args.command == 'init':