diff --git a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
index 06a4b85e..02d4bff8 100644
--- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
+++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
@@ -44,7 +44,7 @@ class AutoPlaylistUsermod : public Usermod {
 
   public:
 
-    AutoPlaylistUsermod(const char *name, bool enabled):Usermod(name, enabled) {}
+    AutoPlaylistUsermod(bool enabled):Usermod("AutoPlaylist", enabled) {}
 
     // gets called once at boot. Do all initialization that doesn't depend on
     // network here
@@ -156,6 +156,18 @@ class AutoPlaylistUsermod : public Usermod {
       }
 
       JsonArray infoArr = user.createNestedArray(FPSTR(_name));  // name
+      String uiDomString = F("<button class=\"btn btn-xs\" onclick=\"requestJson({");
+      uiDomString += FPSTR(_name);
+      uiDomString += F(":{");
+      uiDomString += FPSTR(_enabled);
+      uiDomString += enabled ? F(":false}});\">") : F(":true}});\">");
+      uiDomString += F("<i class=\"icons");
+      uiDomString += enabled ? F(" on") : F(" off");
+      uiDomString += F("\">&#xe08f;</i>");
+      uiDomString += F("</button>");
+      infoArr.add(uiDomString);
+
+      infoArr = user.createNestedArray(F(""));
       if(!enabled) {
         infoArr.add("disabled");  
       }
@@ -177,10 +189,11 @@ class AutoPlaylistUsermod : public Usermod {
      */
     void readFromJsonState(JsonObject& root) {
       if (!initDone) return;  // prevent crash on boot applyPreset()
-      bool en = enabled;
       JsonObject um = root[FPSTR(_name)];
       if (!um.isNull()) {
-        if (en != enabled) enabled = en;
+        if (um[FPSTR(_enabled)].is<bool>()) {
+          enabled = um[FPSTR(_enabled)].as<bool>();
+        }
       }
     }
 
diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp
index 334d3e59..3cb5c19c 100644
--- a/wled00/usermods_list.cpp
+++ b/wled00/usermods_list.cpp
@@ -406,7 +406,7 @@ void registerUsermods()
 #endif
 
 #ifdef USERMOD_AUTO_PLAYLIST
-  usermods.add(new AutoPlaylistUsermod("Auto Playlist", true));
+  usermods.add(new AutoPlaylistUsermod(true));
 #endif