--- a/log.pl	Tue Jan 13 09:46:21 2015 +0100
+++ b/log.pl	Wed Aug 12 17:51:37 2015 +0200
@@ -104,6 +104,9 @@
         },
     ) or pod2usage();
 
+    # override the HGUSER  to the 'remote user' from our SSH connect
+    $ENV{HGUSER} = env_user() // $ENV{USER} // $ENV{LOGNAME} // getpwuid($>);
+
     if ($opt_message =~ /^@(.*)/) {
         @ARGV = $1;
         $opt_message = join "", <>;
@@ -300,10 +303,17 @@
 
 }
 
+sub env_user {
+    foreach (qw(IUS_USER IUS_PROFILE REMOTE_USER)) {
+	return $ENV{$_} if length defined $ENV{$_};
+    }
+    return undef;
+}
+
 sub identity() {
     my $user = `who am i`;
     chomp $user;
-    $user .= " [" . ($ENV{IUS_PROFILE} || $ENV{REMOTE_USER} || "-") . "]";
+    $user .= " [" . env_user() // '-' . "]";
     return $user;
 }