diff --git a/contrib/mympd.service b/contrib/mympd.service
index f8afeb7..89d09a6 100644
--- a/contrib/mympd.service
+++ b/contrib/mympd.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=myMPD server daemon
-Requires=network.target local-fs.target
+Requires=network.target local-fs.target mpd.service
 
 [Service]
 EnvironmentFile=/etc/mympd/options
-ExecStart=/usr/bin/mympd --user $MYMPD_USER --webport $WEB_PORT --mpdhost $MPD_HOST --mpdport $MPD_PORT $MPD_PASSWORD $COVERIMAGE $STATEFILE $SSL
+ExecStart=/usr/bin/mympd --user $MYMPD_USER --webport $WEB_PORT --mpdhost $MPD_HOST --mpdport $MPD_PORT --mpdpass $MPD_PASSWORD --coverimage $COVERIMAGE --statefile $STATEFILE $SSL
 Type=simple
 
 [Install]
diff --git a/contrib/options b/contrib/options
index 2fe36d5..9958ed2 100644
--- a/contrib/options
+++ b/contrib/options
@@ -1,9 +1,9 @@
 #myMPD startup options
 MPD_HOST=localhost
 MPD_PORT=6600
-#MPD_PASSWORD=--mpdpass PASSWORD
+#MPD_PASSWORD=PASSWORD
 WEB_PORT=80
 SSL=-S -W 443 -C /etc/mympd/ssl/server.pem -K /etc/mympd/ssl/server.key
 MYMPD_USER=nobody
-COVERIMAGE=--coverimage folder.jpg
-STATEFILE=--statefile /var/lib/mympd/mympd.state
+COVERIMAGE=folder.jpg
+STATEFILE=/var/lib/mympd/mympd.state