diff --git a/git-review b/git-review
index 411ca6ab..6dc70165 100755
--- a/git-review
+++ b/git-review
@@ -163,12 +163,11 @@ def make_remote_url(username, hostname, port, project):
         return "ssh://%s@%s:%s/%s" % (username, hostname, port, project)
 
 
-def add_remote(username, hostname, port, project):
+def add_remote(hostname, port, project):
     """ Adds a gerrit remote. """
     asked_for_username = False
 
-    if not username:
-        username = os.getenv("USERNAME")
+    username = os.getenv("USERNAME")
     if not username:
         username = run_command('git config --get gitreview.username')
     if not username:
@@ -328,7 +327,7 @@ def check_remote(branch, remote, hostname, port, project):
 
     # Gerrit remote not present, try to add it
     try:
-        add_remote(None, hostname, port, project)
+        add_remote(hostname, port, project)
     except:
         print sys.exc_info()[2]
         print "We don't know where your gerrit is. Please manually create "