diff --git a/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java b/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
index 37298809ee..43bf484a2a 100644
--- a/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
+++ b/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
@@ -65,13 +65,21 @@ public class HgRepositoryClient extends AbstractRepositoryClient
   {
     super(localRepository, remoteRepository);
 
-    String scheme = remoteRepository.substring(0,
-                      remoteRepository.indexOf("://") + 3);
-    StringBuilder buffer = new StringBuilder(scheme);
+    if ((username != null) && (password != null))
+    {
+      String scheme = remoteRepository.substring(0,
+                        remoteRepository.indexOf("://") + 3);
+      StringBuilder buffer = new StringBuilder(scheme);
+
+      buffer.append(username).append(":").append(password).append("@");
+      buffer.append(remoteRepository.substring(scheme.length()));
+      remoteURL = buffer.toString();
+    }
+    else
+    {
+      remoteURL = remoteRepository;
+    }
 
-    buffer.append(username).append(":").append(password).append("@");
-    buffer.append(remoteRepository.substring(scheme.length()));
-    remoteURL = buffer.toString();
     hg = IOUtil.search("hg");
   }