Index: /trunk/plugins/WidgetManager/lib/WidgetManager/App.pm
===================================================================
--- /trunk/plugins/WidgetManager/lib/WidgetManager/App.pm (revision 433)
+++ /trunk/plugins/WidgetManager/lib/WidgetManager/App.pm (revision 438)
@@ -141,5 +141,5 @@
     delete $modulesets->{$q->param('widgetmanager')};
     # Handle renaming: Delete the entry that has changed names.
-    delete $modulesets->{$q->param('old_name')} unless $q->param('old_name') eq $q->param('name');
+    delete $modulesets->{$q->param('old_name')}; # unless $q->param('old_name') eq $q->param('name');
     if(exists $modulesets->{$q->param('name')}) {
         return $app->error($app->plugin->translate(
Index: /trunk/plugins/WidgetManager/tmpl/edit.tmpl
===================================================================
--- /trunk/plugins/WidgetManager/tmpl/edit.tmpl (revision 428)
+++ /trunk/plugins/WidgetManager/tmpl/edit.tmpl (revision 438)
@@ -17,4 +17,5 @@
 function checkName() {
         widgetname = document.getElementById('name').value;
+        oldname = document.getElementById('old_name').value;
 
         var1 = "<TMPL_LOOP NAME=WIDGETMANAGERS><TMPL_VAR NAME=widgetmanager>,</TMPL_LOOP>"
@@ -23,5 +24,5 @@
         for (var i=0; i < var2.length; i++) {
 
-            if (var2[i] == widgetname) {
+            if (var2[i] == widgetname && widgetname != oldname) {
                 alert('<MT_TRANS phrase="You already have a widget manager named [_1]. Please use a unique name for this widget manager." params="$name">'.replace(/\$name/, widgetname));
                 return false;
@@ -297,8 +298,8 @@
 <div id="edit-form">
 
-    <form onsubmit="return checkName(); this.modules.value = moduleListStr();" id="manager" name="manager" method="post" action="widget-manager.cgi">
+    <form onsubmit="this.modules.value = moduleListStr(); return checkName();" id="manager" name="manager" method="post" action="widget-manager.cgi">
       <input type="hidden" name="__mode" value="save" />
       <input type="hidden" name="blog_id" value="<TMPL_VAR NAME=BLOG_ID>" />
-      <input type="hidden" name="old_name" value="<TMPL_VAR NAME=NAME>" />
+      <input type="hidden" name="old_name" id="old_name" value="<TMPL_VAR NAME=NAME>" />
       <div id="widgetmanagers">
         <p>