diff --git a/templates/2k11/admin/media_upload.tpl b/templates/2k11/admin/media_upload.tpl
index 04a60e9e..403e008d 100644
--- a/templates/2k11/admin/media_upload.tpl
+++ b/templates/2k11/admin/media_upload.tpl
@@ -34,18 +34,18 @@
 
         <div id="upload_template" class="hidden">
             <div class="form_field clearfix">
-                <label for="userfile_0" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
-                <input id="userfile_0" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
+                <label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
+                <input id="userfile_1" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
             </div>
 
             <div class="form_field clearfix">
-                <label for="target_filename_0" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label>
-                <input id="target_filename_0" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
+                <label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label>
+                <input id="target_filename_1" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
             </div>
 
             <div class="form_select clearfix">
-                <label for="target_directory_0" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
-                <select id="target_directory_0" class="uploadform_target_directory" name="serendipity[target_directory][1]">
+                <label for="target_directory_1" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
+                <select id="target_directory_1" class="uploadform_target_directory" name="serendipity[target_directory][1]">
                     <option value="">{$CONST.BASE_DIRECTORY}</option>
                     {foreach from=$media.folders item="folder"}
                     <option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option>
@@ -53,7 +53,7 @@
                 </select>
             </div>
 
-            <div id="ccounter"><input id="column_count_0" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
+            <div id="ccounter"><input id="column_count_1" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
         </div>
 
         <div id="debug"></div>
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index b4c21269..a8e4d200 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -435,12 +435,15 @@ function treeToggleAll() {
 }
 
 // Used by media_upload.tpl to …?
+function getfilename(value) { 
+    re = /^.+[\/\\]+?(.+)$/;
+    return value.replace(re, "$1"); 
+}
+
 var inputStorage = new Array();
 
 function checkInputs() { 
-    var fieldcount = $('.uploadform_userfile').length;
-
-    for (i = 1; i <= fieldcount; i++) { 
+    for (i = 1; i <= upload_fieldcount; i++) { 
         if (!inputStorage[i]) { 
             fillInput(i, i);
         } else if (inputStorage[i] == document.getElementById('target_filename_' + i).value) { 
@@ -449,7 +452,6 @@ function checkInputs() {
     } 
 }
 
-// Helper function for checkInputs()
 function fillInput(source, target) { 
     useDuplicate = false;
 
@@ -470,18 +472,13 @@ function fillInput(source, target) {
     if (useDuplicate) { 
         tkey = target + 1;
 
-        if (!inputStorage[tkey] || inputStorage[tkey] == document.getElementById('target_filename_' + tkey).value) {ldelim}
+        if (!inputStorage[tkey] || inputStorage[tkey] == document.getElementById('target_filename_' + tkey).value) { 
             document.getElementById('target_filename_' + (target+1)).value = sourceval;
             inputStorage[target + 1] = '~~~';
         }
     }
 }
-
-// Helper function for fillInput()
-function getfilename(value) { 
-    re = /^.+[\/\\]+?(.+)$/;
-    return value.replace(re, "$1"); 
-}
+// end …?
 
 // Hides the foreign upload form if batch upload is used (if more
 // images are added)
@@ -497,7 +494,7 @@ function rememberUploadOptions() {
 
 // Clones the upload form template
 function addUploadField() {
-    var upload_fieldcount = $('.uploadform_userfile').length;
+    upload_fieldcount = $('.uploadform_userfile').length + 1;
 
     var $fields = $('#upload_template').clone();
     $fields.attr('id', 'upload_form_' + upload_fieldcount);