diff --git a/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java b/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java
index ecb62c385694..3a2a44d515b3 100644
--- a/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java
+++ b/plugins/git4idea/src/git4idea/remote/GitRememberedInputs.java
@@ -65,6 +65,15 @@ public class GitRememberedInputs implements PersistentStateComponent<GitRemember
   }
 
   public void addUrl(@NotNull String url, @NotNull String userName) {
+    for (UrlAndUserName visitedUrl : myState.visitedUrls) {
+      if (visitedUrl.url.equalsIgnoreCase(url)) {  // don't add multiple entries for a single url
+        if (!userName.isEmpty()) {                 // rewrite username, unless no username is specified
+          visitedUrl.userName = userName;
+        }
+        return;
+      }
+    }
+
     UrlAndUserName urlAndUserName = new UrlAndUserName();
     urlAndUserName.url = url;
     urlAndUserName.userName = userName;