diff --git a/git-review b/git-review
index 708cf97..6009c3a 100755
--- a/git-review
+++ b/git-review
@@ -113,6 +113,10 @@ def add_remote(username, hostname, port, project):
 
     if username is None:
         username = os.getenv("USERNAME")
+    if username is None:
+        username = os.getenv("USER")
+    if username is None:
+        username = raw_input("Enter your gerrit username: ")
     if port is None:
         port = 29418