1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 1cf7e30eb1..fbc8d761c2 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -480,7 +480,9 @@ inline void QUrlPrivate::appendAuthority(QString &appendTo, QUrl::FormattingOpti
 {
     if ((options & QUrl::RemoveUserInfo) != QUrl::RemoveUserInfo) {
         appendUserInfo(appendTo, options, appendingTo);
-        if (hasUserInfo())
+
+        // add '@' only if we added anything
+        if (hasUserName() || (hasPassword() && (options & QUrl::RemovePassword) == 0))
             appendTo += QLatin1Char('@');
     }
     appendHost(appendTo, options);