diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 488aa8c6..9d88e6c8 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -469,13 +469,12 @@
     }
 
     // Rename file in media db
-    var media_rename = '{$CONST.ENTER_NEW_NAME}';
-    var media_token_url = '{$token_url}';
-
     serendipity.rename = function(id, fname) {
         var newname;
+        var media_rename = '{$CONST.ENTER_NEW_NAME}';
+        var media_token_url = $('input[name*="serendipity[token]"]').val();
         if (newname = prompt(media_rename + fname, fname)) {
-            location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname) +'&'+ media_token_url;
+            location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname) +'&serendipity[token]='+ media_token_url;
         }
     }
 
diff --git a/templates/default/admin/serendipity_editor.js b/templates/default/admin/serendipity_editor.js
index 5da6a30a..67696b41 100644
--- a/templates/default/admin/serendipity_editor.js
+++ b/templates/default/admin/serendipity_editor.js
@@ -469,13 +469,12 @@
     }
 
     // Rename file in media db
-    var media_rename = 'Enter the new name for: ';
-    var media_token_url = 'serendipity[token]=f269826ef0ccf3c5f76ba0674f7deca6';
-
     serendipity.rename = function(id, fname) {
         var newname;
+        var media_rename = 'Enter the new name for: ';
+        var media_token_url = $('input[name*="serendipity[token]"]').val();
         if (newname = prompt(media_rename + fname, fname)) {
-            location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname) +'&'+ media_token_url;
+            location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname) +'&serendipity[token]='+ media_token_url;
         }
     }
 
@@ -1304,4 +1303,3 @@ $(function() {
             }
         }
     }
-    
\ No newline at end of file