1 files changed, 6 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index c5cdeb1cf7..6ff80c3cc2 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -610,8 +610,12 @@ QUrl RbUtilQt::proxy()
 {
     QUrl proxy;
     QString proxytype = RbSettings::value(RbSettings::ProxyType).toString();
-    if(proxytype == "manual")
-        proxy.setEncodedUrl(RbSettings::value(RbSettings::Proxy).toByteArray());
+    if(proxytype == "manual") {
+        proxy.setUrl(RbSettings::value(RbSettings::Proxy).toString(),
+                QUrl::TolerantMode);
+        QByteArray pw = QByteArray::fromBase64(proxy.password().toUtf8());
+        proxy.setPassword(pw);
+    }
     else if(proxytype == "system")
         proxy = System::systemProxy();