diff --git a/lib/que/locker.rb b/lib/que/locker.rb
index cb7ec40a..4778bfda 100644
--- a/lib/que/locker.rb
+++ b/lib/que/locker.rb
@@ -149,8 +149,8 @@ def initialize(
           opts =
             {
               host:     uri.host,
-              user:     uri.user,
-              password: uri.password,
+              user:     uri.user && URI.decode_www_form_component(uri.user),
+              password: uri.password && URI.decode_www_form_component(uri.password),
               port:     uri.port || 5432,
               dbname:   uri.path[1..-1],
             }