diff --git a/htdocs/index.html b/htdocs/index.html
index 7a90c25..538c8fe 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -197,7 +197,10 @@
                 data-trigger="manual" />
               </div>
               <div class="form-group col-md-12">
-                <div id="mpd_password_set" class="hide alert alert-info">MPD Password is set</div>
+                <div id="mpd_password_set" class="hide alert alert-info">
+                  <button type="button" class="close" aria-hidden="true">&times;</button>
+                  MPD Password is set
+                </div>
               </div>
 
             </div>
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 6344679..9e7d6c7 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -569,6 +569,13 @@ function confirmSettings() {
     $('#settings').modal('hide');
 }
 
+$('#mpd_password_set > button').on('click', function (e) {
+    socket.send('MPD_API_SET_MPDPASS,');
+    $('#mpd_pw').val("");
+    $('#mpd_pw_con').val("");
+    $('#mpd_password_set').addClass('hide');
+})
+
 function notificationsSupported() {
     return "webkitNotifications" in window;
 }