diff --git a/Html/scripts/PluginUpdatesPage.js b/Html/scripts/PluginUpdatesPage.js
index 4edb08602..a89169c53 100644
--- a/Html/scripts/PluginUpdatesPage.js
+++ b/Html/scripts/PluginUpdatesPage.js
@@ -41,7 +41,7 @@
         var options = PluginUpdatesPage.getHtmlOptions(["Off", "On"], (plugin.EnableAutoUpdate ? "On" : "Off"));
 
         html += "<td>";
-        html += "<select data-uniqueid='" + plugin.UniqueId + "' onchange='PluginUpdatesPage.setAutoUpdate(this);' data-role='slider' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
+        html += "<select data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setAutoUpdate(this);' data-role='slider' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
         html += "</td>";
 
         fieldId = "liPluginUpdateFieldb" + fieldIndex;
@@ -49,7 +49,7 @@
         options = PluginUpdatesPage.getHtmlOptions(["Release", "Beta", "Dev"], plugin.UpdateClass);
 
         html += "<td>";
-        html += "<select data-uniqueid='" + plugin.UniqueId + "' onchange='PluginUpdatesPage.setUpdateClass(this);' data-inline='true' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
+        html += "<select data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setUpdateClass(this);' data-inline='true' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
         html += "</td>";
 
         html += "</tr>";
@@ -79,7 +79,7 @@
 
     setAutoUpdate: function (select) {
 
-        var id = $(select).attr('data-uniqueid');
+        var id = $(select).attr('data-id');
 
         Dashboard.showLoadingMsg();
 
@@ -93,7 +93,7 @@
 
     setUpdateClass: function (select) {
 
-        var id = $(select).attr('data-uniqueid');
+        var id = $(select).attr('data-id');
 
         Dashboard.showLoadingMsg();
 
diff --git a/Html/scripts/PluginsPage.js b/Html/scripts/PluginsPage.js
index f7e05e4ba..e9098427d 100644
--- a/Html/scripts/PluginsPage.js
+++ b/Html/scripts/PluginsPage.js
@@ -40,7 +40,7 @@
             }
             
             var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) {
-                return pluginConfigurationPage.OwnerPluginName == plugin.Name;
+                return pluginConfigurationPage.PluginId == plugin.Id;
             })[0];
 
             html += "<li>";
@@ -56,7 +56,7 @@
             html += "</a>";
 
             if (!plugin.IsCorePlugin) {
-                html += "<a data-uniqueid='" + plugin.UniqueId + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>Delete</a>";
+                html += "<a data-id='" + plugin.Id + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>Delete</a>";
             }
 
             html += "</li>";
@@ -70,7 +70,7 @@
     deletePlugin: function (link) {
 
         var name = link.getAttribute('data-pluginname');
-        var uniqueid = link.getAttribute('data-uniqueid');
+        var uniqueid = link.getAttribute('data-id');
 
         var msg = "Are you sure you wish to uninstall " + name + "?";