diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 0ed0132..143eec9 100644
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -30,9 +30,9 @@ local function worker(format, warg)
     }
 
     -- Fallback to MPD defaults
-    local pass = warg and warg[1] or "\"\""
-    local host = warg and warg[2] or "127.0.0.1"
-    local port = warg and warg[3] or "6600"
+    local pass = warg and (warg.password or warg[1]) or "\"\""
+    local host = warg and (warg.host or warg[2]) or "127.0.0.1"
+    local port = warg and (warg.port or warg[3]) or "6600"
 
     -- Construct MPD client options
     local mpdh = "telnet://"..host..":"..port