diff -r 838025b15925 -r 6dfb78f18bdb mercurial/ui.py
--- a/mercurial/ui.py	Wed Jul 30 14:51:56 2014 -0500
+++ b/mercurial/ui.py	Sat Jul 26 09:27:11 2014 +0300
@@ -437,7 +437,7 @@
         """
         user = os.environ.get("HGUSER")
         if user is None:
-            user = self.config("ui", "username")
+            user = self.config("ui", ["username", "user"])
             if user is not None:
                 user = os.path.expandvars(user)
         if user is None: