diff --git a/bin/whoami b/bin/whoami
index add4eb2a..dc953127 100644
--- a/bin/whoami
+++ b/bin/whoami
@@ -26,7 +26,8 @@ my @coderefs = (
 	sub { getpwuid($>) },
 	sub { require Win32; Win32::LoginName() },
 	sub { getlogin },
-	sub { defined $ENV{USER} ? $ENV{USER} : $ENV{USERNAME} },
+	sub { $ENV{'USER'} },
+	sub { $ENV{'USERNAME'} },
 	);
 
 foreach my $coderef ( @coderefs ) {