--- mpd.py	2008-04-04 22:55:38.000000000 +0200
+++ mpd-new.py	2008-10-30 20:31:40.000000000 +0100
@@ -4,6 +4,8 @@
 #
 # CHANGELOG
 #
+#  2008-10-30
+#   * fixed "Now playing" when having a password on MPD
 #  2007-11-16
 #   * added watcher support
 #   * added formatting options ('song-status')
@@ -123,13 +125,17 @@
         s.connect((cfg.get('server-host'), cfg.get('server-port')))
     except socket.error, e:
         raise MPDError, 'Failed to connect to server: %s' % str(e)
-    if cfg.get('server-pass') and cfg.get('server-pass') != 'off':
-        s.send('password %s\n' % cfg.get('server-pass'))
     m = s.makefile('r')
     l = m.readline()
     if not l.startswith('OK MPD '):
-        s.close()
-        raise MPDError, 'Protocol error'
+	s.close()
+	raise MPDError, 'Protocol error'
+    if cfg.get('server-pass') and cfg.get('server-pass') != 'off':
+        s.send('password %s\n' % cfg.get('server-pass'))
+        l = m.readline()
+        if not l.startswith('OK'):
+            s.close()
+            raise MPDError, 'Protocol error'
     s.send('%s\n' % command)
     s.send('close\n')
     d = []