diff --git a/src/XrdCl/XrdClURL.cc b/src/XrdCl/XrdClURL.cc
index b627f9a579c..b05af11cd65 100644
--- a/src/XrdCl/XrdClURL.cc
+++ b/src/XrdCl/XrdClURL.cc
@@ -368,8 +368,13 @@ namespace XrdCl
   void URL::ComputeHostId()
   {
     std::ostringstream o;
-    if( pUserName.length() )
-      o << pUserName << "@";
+    if( !pUserName.empty() )
+    {
+      o << pUserName;
+      if( !pPassword.empty() )
+        o << ":" << pPassword;
+      o << "@";
+    }
     o << pHostName << ":" << pPort;
     pHostId = o.str();
   }