diff --git a/bazarr/config.py b/bazarr/config.py
index db5e30849..d38c4d3eb 100644
--- a/bazarr/config.py
+++ b/bazarr/config.py
@@ -3,6 +3,8 @@
 import hashlib
 import os
 
+from urllib.parse import quote_plus
+
 from subliminal.cache import region
 
 from simpleconfigparser import simpleconfigparser
@@ -372,8 +374,8 @@ def configure_captcha_func():
 def configure_proxy_func():
     if settings.proxy.type != 'None':
         if settings.proxy.username != '' and settings.proxy.password != '':
-            proxy = settings.proxy.type + '://' + settings.proxy.username + ':' + settings.proxy.password + '@' + \
-                    settings.proxy.url + ':' + settings.proxy.port
+            proxy = settings.proxy.type + '://' + quote_plus(settings.proxy.username) + ':' + \
+                    quote_plus(settings.proxy.password) + '@' + settings.proxy.url + ':' + settings.proxy.port
         else:
             proxy = settings.proxy.type + '://' + settings.proxy.url + ':' + settings.proxy.port
         os.environ['HTTP_PROXY'] = str(proxy)