diff --git a/ChangeLog b/ChangeLog
index 937e4a4..f9a2e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-05 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* EcConsole.m: Use SUDO_USER preferentially as username of person
+	executing command.  This is supplied when the command is run via sudo.
+
 2022-07-12 Richard Frith-Macdonald <rfm@gnu.org>
 
 	configure.ac:
@@ -10,7 +15,7 @@
 
 2022-07-11 Richard Frith-Macdonald <rfm@gnu.org>
 
-	* EcConsole.m: Exit immediately after egistration with Control server
+	* EcConsole.m: Exit immediately after registration with Control server
 	is rejected (don't re-prompt for password before exit).
 
 2022-06-17 Richard Frith-Macdonald <rfm@gnu.org>
diff --git a/EcConsole.m b/EcConsole.m
index 66c81ee..053c1cf 100644
--- a/EcConsole.m
+++ b/EcConsole.m
@@ -764,7 +764,14 @@ static NSString	*originalUserName = nil;
 
 - (id) initWithDefaults: (NSDictionary*)defs
 {
-  ASSIGN(originalUserName, NSUserName());
+  /* When executing a command using sudo, we should use the original username
+   */
+  ASSIGN(originalUserName,
+    [[[NSProcessInfo processInfo] environment] objectForKey: @"SUDO_USER"]);
+  if (nil == originalUserName)
+    {
+      ASSIGN(originalUserName, NSUserName());
+    }
   self = [super initWithDefaults: defs];
   if (self)
     {