diff --git a/contrib/init.debian b/contrib/init.debian
index 405739c..163b7ef 100755
--- a/contrib/init.debian
+++ b/contrib/init.debian
@@ -35,7 +35,7 @@ WEB_PORT=8080
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
-DAEMON_OPT="--user $YMPD_USER --mpdpass $MPD_PASSWORD --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT"
+DAEMON_OPT="--user $YMPD_USER --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT"
 
 do_start()
 {
diff --git a/contrib/ympd.service b/contrib/ympd.service
index d4d2ae2..023b926 100644
--- a/contrib/ympd.service
+++ b/contrib/ympd.service
@@ -9,7 +9,7 @@ Environment=MPD_PASSWORD=
 Environment=WEB_PORT=8080
 Environment=YMPD_USER=nobody
 EnvironmentFile=/etc/default/ympd
-ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass $MPD_PASSWORD --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT
+ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT
 Type=simple
 
 [Install]