diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index a23b29ca5..1a41344cd 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -34,7 +34,7 @@ jQuery(document).ready(function(){ldelim}
   <p>
     <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     {'Add a virtual album'|@translate} : <input type="text" name="virtual_name">
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd">
     {if count($categories)>9 }
     <a href="#EoP" class="button" style="border:0;">
 		<img src="{$themeconf.admin_icon_dir}/page_end.png" title="{'Page end'|@translate}" class="button" alt="page_end" style="margin-bottom:-0.6em;"></a>
@@ -47,7 +47,7 @@ jQuery(document).ready(function(){ldelim}
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   <div class="orderParams">
-    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}">
     <label><input type="radio" name="order_type" value="manual" checked="checked"> {'manual order'|@translate}</label>
     <label><input type="radio" name="order_type" value="automatic"> {'automatic order'|@translate}</label>
     <span id="automatic_order_params" style="display:none">
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index b7336045d..d3fd98c1c 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -117,7 +117,7 @@
 </fieldset>
 
 <p style="text-align:center;">
-  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
   <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
 </p>
 
@@ -135,7 +135,7 @@
       </td>
       <td>
         {if $representant.ALLOW_SET_RANDOM }
-        <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}" {$TAG_INPUT_ENABLED}></p>
+        <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}"></p>
         {/if}
 
         {if isset($representant.ALLOW_DELETE) }
@@ -172,7 +172,7 @@
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd">
     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
   </p>
 
@@ -193,7 +193,7 @@
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations">
     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
   </p>
 
@@ -222,7 +222,7 @@
   </table>
 
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail">
     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
   </p>
 
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index b42a71b2b..d0dc98e13 100644
--- a/admin/themes/default/template/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
@@ -29,7 +29,7 @@
   </fieldset>
 
   <p>
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
 
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index 5f7e52780..76e9d3214 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -15,7 +15,7 @@
       <li><label><input type="checkbox" name="deny_groups[]" value="{$id}"> {$all_groups[$id]}</label></li>
       {/foreach}
     </ul>
-    <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}">
   </fieldset>
 
   <fieldset>
@@ -25,7 +25,7 @@
       <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li>
       {/foreach}
     </ul>
-    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}">
   </fieldset>
 
   <h4>{'Users'|@translate}</h4>
@@ -37,7 +37,7 @@
       <li><label><input type="checkbox" name="deny_users[]" value="{$id}"> {$all_users[$id]}</label></li>
       {/foreach}
     </ul>
-    <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}">
   </fieldset>
 
   <fieldset>
@@ -58,7 +58,7 @@
       <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li>
       {/foreach}
     </ul>
-    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
   </fieldset>
 
 </form>
diff --git a/admin/themes/default/template/check_integrity.tpl b/admin/themes/default/template/check_integrity.tpl
index c935e883c..f11e76ec6 100644
--- a/admin/themes/default/template/check_integrity.tpl
+++ b/admin/themes/default/template/check_integrity.tpl
@@ -95,10 +95,10 @@
 
         <p>
           {if $c13y_show_submit_automatic_correction}
-            <input class="submit" type="submit" value="{'Apply selected corrections'|@translate}" name="Apply selected corrections" {$TAG_INPUT_ENABLED}>
+            <input class="submit" type="submit" value="{'Apply selected corrections'|@translate}" name="Apply selected corrections">
           {/if}
           {if $c13y_show_submit_ignore}
-            <input class="submit" type="submit" value="{'Ignore selected anomalies'|@translate}" name="Ignore selected anomalies" {$TAG_INPUT_ENABLED}>
+            <input class="submit" type="submit" value="{'Ignore selected anomalies'|@translate}" name="Ignore selected anomalies">
           {/if}
           <input class="submit" type="submit" value="{'Refresh'|@translate}" name="Refresh">
           </p>
diff --git a/admin/themes/default/template/comments.tpl b/admin/themes/default/template/comments.tpl
index cb870ab20..952d3f1dd 100644
--- a/admin/themes/default/template/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
@@ -63,8 +63,8 @@ $(document).ready(function(){
   </p>
 
   <p class="bottomButtons">
-    <input class="submit" type="submit" name="validate" value="{'Validate'|@translate}" {$TAG_INPUT_ENABLED}>
-    <input class="submit" type="submit" name="reject" value="{'Reject'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="validate" value="{'Validate'|@translate}">
+    <input class="submit" type="submit" name="reject" value="{'Reject'|@translate}">
   </p>
 
 </form>
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 6c0a1740e..7a6583779 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -387,7 +387,7 @@
 
 {if !isset($default)}
   <p>
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
 </form>
diff --git a/admin/themes/default/template/double_select.tpl b/admin/themes/default/template/double_select.tpl
index ee9704419..62e99fbe2 100644
--- a/admin/themes/default/template/double_select.tpl
+++ b/admin/themes/default/template/double_select.tpl
@@ -8,7 +8,7 @@
       <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
         {html_options options=$category_option_true selected=$category_option_true_selected}
       </select>
-      <p><input class="submit" type="submit" value="&raquo;" name="falsify" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+      <p><input class="submit" type="submit" value="&raquo;" name="falsify" style="font-size:15px;"></p>
     </td>
 
     <td>
@@ -16,7 +16,7 @@
       <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
         {html_options options=$category_option_false selected=$category_option_false_selected}
       </select>
-      <p><input class="submit" type="submit" value="&laquo;" name="trueify" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+      <p><input class="submit" type="submit" value="&laquo;" name="trueify" style="font-size:15px;"></p>
     </td>
   </tr>
 </table>
diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index d0b9b0322..d2c08bf8b 100644
--- a/admin/themes/default/template/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
@@ -88,7 +88,7 @@ jQuery(document).ready(function() {
     </p>
     <p>
     <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label>
-    <input class="submit" type="submit" value="{'Delete selected photos'|@translate}" name="delete" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Delete selected photos'|@translate}" name="delete">
     </p>
   </fieldset>
   {/if}
@@ -199,7 +199,7 @@ jQuery(document).ready(function() {
     </p>
 
 
-    <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p>
+    <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
 
   </fieldset>
 
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 12dfce448..4a32b09c5 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -22,7 +22,7 @@ jQuery(document).ready(function() {
 
 {if !empty($thumbnails)}
 <form action="{$F_ACTION}" method="post">
-  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p>
+  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
   <fieldset>
     <legend>{'Edit ranks'|@translate}</legend>
     {if !empty($thumbnails)}
@@ -65,7 +65,7 @@ jQuery(document).ready(function() {
       </p>
       {/foreach}
   </fieldset>
-  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}></p>
+  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"></p>
 </form>
 
 
diff --git a/admin/themes/default/template/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl
index 21b521b1e..dd2080667 100644
--- a/admin/themes/default/template/element_set_unit.tpl
+++ b/admin/themes/default/template/element_set_unit.tpl
@@ -131,7 +131,7 @@ jQuery(document).ready(function() {
 {/foreach}
 
 <p>
-  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
   <input class="submit" type="reset" value="{'Reset'|@translate}">
 </p>
 {/if}
diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 38122ae13..c0aac7fed 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -11,7 +11,7 @@
     <input type="text" id="groupname" name="groupname" maxlength="50" size="20">
 
     <p>
-      <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}">
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     </p>
   </fieldset>
@@ -33,10 +33,10 @@
         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
       <a href="{$group.U_DELETE}" onclick="return confirm('{'delete'|@translate|@escape:'javascript'}' 
 				+ '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" alt="{'Delete'|@translate}" title="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" alt="{'Delete'|@translate}" title="{'Delete'|@translate}"></a>
       <a href="{$group.U_ISDEFAULT}" onclick="return confirm('{'Toggle \'default group\' property'|@translate|@escape:'javascript'}' 
 				+'\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" alt="{'Toggle \'default group\' property'|@translate}" title="{'Toggle \'default group\' property'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" alt="{'Toggle \'default group\' property'|@translate}" title="{'Toggle \'default group\' property'|@translate}"></a>
     </td>
   </tr>
   {/foreach}
diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
index 04339f4cb..db39d3d2d 100644
--- a/admin/themes/default/template/maintenance.tpl
+++ b/admin/themes/default/template/maintenance.tpl
@@ -4,25 +4,25 @@
 
 <ul>
   {foreach from=$advanced_features item=feature}
-    <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li>
+    <li><a href="{$feature.URL}">{$feature.CAPTION}</a></li>
   {/foreach}
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update albums informations'|@translate}</a></li>
-  <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li>
-  <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'Repair and optimize database'|@translate}</a></li>
+  <li><a href="{$U_MAINT_CATEGORIES}">{'Update albums informations'|@translate}</a></li>
+  <li><a href="{$U_MAINT_IMAGES}">{'Update images informations'|@translate}</a></li>
+  <li><a href="{$U_MAINT_DATABASE}">{'Repair and optimize database'|@translate}</a></li>
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history detail'|@translate}</a></li>
-  <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history summary'|@translate}</a></li>
-  <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'Purge sessions'|@translate}</a></li>
-  <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'Purge never used notification feeds'|@translate}</a></li>
-  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
-  <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li>
+  <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');">{'Purge history detail'|@translate}</a></li>
+  <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');">{'Purge history summary'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li>
+  <li><a href="{$U_MAINT_FEEDS}">{'Purge never used notification feeds'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');">{'Purge search history'|@translate}</a></li>
+  <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'Reinitialize check integrity'|@translate}</a></li>
+  <li><a href="{$U_MAINT_C13Y}">{'Reinitialize check integrity'|@translate}</a></li>
 </ul>
diff --git a/admin/themes/default/template/menubar.tpl b/admin/themes/default/template/menubar.tpl
index 8886a505b..4a6fb4df8 100644
--- a/admin/themes/default/template/menubar.tpl
+++ b/admin/themes/default/template/menubar.tpl
@@ -60,8 +60,8 @@ jQuery(document).ready(function(){ldelim}
     {/foreach}
   </ul>
   <p class="menuSubmit">
-    <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
-    <input type="submit" name="reset" value="{'Reset'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input type="submit" name="submit" value="{'Submit'|@translate}">
+    <input type="submit" name="reset" value="{'Reset'|@translate}">
   </p>
 
 </form>
diff --git a/admin/themes/default/template/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index b66ca31eb..3cddc3936 100644
--- a/admin/themes/default/template/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
@@ -26,7 +26,7 @@ jQuery(document).ready(function(){
   {if isset($REPOST_SUBMIT_NAME)}
   <fieldset>
     <div class="infos">
-      <input class="submit" type="submit" value="{'Continue processing treatment'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'Continue processing treatment'|@translate}" name="{$REPOST_SUBMIT_NAME}">
     </div>
   </fieldset>
   {/if}
@@ -74,7 +74,7 @@ jQuery(document).ready(function(){
   </fieldset>
 
   <p>
-    <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit">
     <input class="submit" type="reset" value="{'Reset'|@translate}" name="param_reset">
   </p>
   {/if}{* isset $param*}
@@ -130,7 +130,7 @@ jQuery(document).ready(function(){
     </fieldset>
 
     <p>
-      <input class="submit" type="submit" value="{'Send'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'Send'|@translate}" name="send_submit">
     </p>
     {/if}
   {/if}{* isset $send*}
diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl
index 48c4de79b..81c537cbb 100644
--- a/admin/themes/default/template/permalinks.tpl
+++ b/admin/themes/default/template/permalinks.tpl
@@ -20,7 +20,7 @@
   </label>
 
   <p>
-    <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}">
   </p>
   </fieldset>
 </form>
@@ -60,7 +60,7 @@
 		<td>{$permalink.date_deleted}</td>
 		<td>{$permalink.last_hit}</td>
 		<td>{$permalink.hit}</td>
-		<td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'Delete'|@translate}]" class="button"></a></td>
+		<td><a href="{$permalink.U_DELETE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'Delete'|@translate}]" class="button"></a></td>
 	</tr>
 {/foreach}
 </table>
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index e16cb4f2c..f14a385a2 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -337,7 +337,7 @@ var sizeLimit = {$upload_max_filesize};
     </fieldset>
 
     <p>
-      <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}">
     </p>
 {elseif $upload_mode eq 'multiple'}
     <p>
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 49d304059..8f10fa04c 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -31,7 +31,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
   <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}"></a></li>
   {/if}
   {if !url_is_remote($PATH)}
-  <li><a href="{$U_SYNC}" title="{'synchronize'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
+  <li><a href="{$U_SYNC}" title="{'synchronize'|@translate}"><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
   {/if}
 </ul>
 
@@ -159,7 +159,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
     </table>
 
     <p style="text-align:center;">
-      <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit">
       <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset">
     </p>
 
@@ -178,7 +178,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
           <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
             {html_options options=$associated_options}
           </select>
-          <p><input class="submit" type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+          <p><input class="submit" type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"></p>
         </td>
 
         <td>
@@ -186,7 +186,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
           <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
             {html_options options=$dissociated_options}
           </select>
-          <p><input class="submit" type="submit" value="&laquo;" name="associate" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+          <p><input class="submit" type="submit" value="&laquo;" name="associate" style="font-size:15px;"></p>
         </td>
       </tr>
     </table>
@@ -205,7 +205,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
           <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
             {html_options options=$elected_options}
           </select>
-          <p><input class="submit" type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+          <p><input class="submit" type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"></p>
         </td>
 
         <td>
@@ -213,7 +213,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
           <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
             {html_options options=$dismissed_options}
           </select>
-          <p><input class="submit" type="submit" value="&laquo;" name="elect" style="font-size:15px;" {$TAG_INPUT_ENABLED}></p>
+          <p><input class="submit" type="submit" value="&laquo;" name="elect" style="font-size:15px;"></p>
         </td>
       </tr>
     </table>
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index eb9a63a1f..7a2551e82 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -56,7 +56,7 @@
     <td>{$rate.RATE}</td>
     <td><b>{$rate.USER}</b></td>
     <td><span class="date">{$rate.DATE}</span></td>
-    <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'Delete'|@translate}]"></a></td>
+    <td><a href="{$rate.U_DELETE}"><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'Delete'|@translate}]"></a></td>
 </tr>
 {/foreach} {*rates*}
 {/foreach} {*images*}
diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl
index dc08b9ae8..60d12e5a7 100644
--- a/admin/themes/default/template/site_manager.tpl
+++ b/admin/themes/default/template/site_manager.tpl
@@ -21,7 +21,7 @@
     {'Create this site'|@translate}:
     <input type="hidden" name="no_check" value="1">
     <input type="hidden" name="galleries_url" value="{$local_listing.URL}">
-    <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input type="submit" name="submit" value="{'Submit'|@translate}">
   </p>
 </form>
 {/if}
@@ -44,18 +44,18 @@
     [<a href="{$site.U_SYNCHRONIZE}" title="{'update the database from files'|@translate}">{'synchronize'|@translate}</a>]
     {if isset($site.U_DELETE)}
       [<a href="{$site.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|escape:'javascript'}');"
-                title="{'delete this site and all its attached elements'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}</a>]
+                title="{'delete this site and all its attached elements'|@translate}">{'delete'|@translate}</a>]
     {/if}
     {if isset($site.remote)}
       <br>
-      [<a href="{$site.remote.U_TEST}" title="{'test this remote site'|@translate}" {$TAG_INPUT_ENABLED}>{'test'|@translate}</a>]
-      [<a href="{$site.remote.U_GENERATE}" title="{'generate file listing.xml on remote site'|@translate}" {$TAG_INPUT_ENABLED}>{'generate listing'|@translate}</a>]
-      [<a href="{$site.remote.U_CLEAN}" title="{'remove remote listing.xml file'|@translate}" {$TAG_INPUT_ENABLED}>{'clean'|@translate}</a>]
+      [<a href="{$site.remote.U_TEST}" title="{'test this remote site'|@translate}">{'test'|@translate}</a>]
+      [<a href="{$site.remote.U_GENERATE}" title="{'generate file listing.xml on remote site'|@translate}">{'generate listing'|@translate}</a>]
+      [<a href="{$site.remote.U_CLEAN}" title="{'remove remote listing.xml file'|@translate}">{'clean'|@translate}</a>]
     {/if}
     {if not empty($site.plugin_links)}
         <br>
       {foreach from=$site.plugin_links item=plugin_link}
-        [<a href="{$plugin_link.U_HREF}" title='{$plugin_link.U_HINT}' {$TAG_INPUT_ENABLED}>{$plugin_link.U_CAPTION}</a>]
+        [<a href="{$plugin_link.U_HREF}" title='{$plugin_link.U_HINT}'>{$plugin_link.U_CAPTION}</a>]
       {/foreach}
     {/if}
   </td></tr>
@@ -70,6 +70,6 @@
     <input type="text" name="galleries_url" id="galleries_url">
   </p>
   <p>
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
   </p>
 </form>
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index ae47525fd..ec0f50dbf 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -90,7 +90,7 @@
 
   <fieldset id="syncSimulate">
     <legend></legend>
-    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED}> {'only perform a simulation (no change in database will be made)'|@translate}</label></li></ul>
+    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked"> {'only perform a simulation (no change in database will be made)'|@translate}</label></li></ul>
   </fieldset>
 
   <fieldset id="catSubset">
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 438a52352..aeca6fe5b 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -24,7 +24,7 @@
 
     <p>
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-      <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
       <input class="submit" type="reset" value="{'Reset'|@translate}">
     </p>
   </fieldset>
@@ -38,7 +38,7 @@
       <input type="text" name="add_tag">
     </label>
     
-    <p><input class="submit" type="submit" name="add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></p>
+    <p><input class="submit" type="submit" name="add" value="{'Submit'|@translate}"></p>
   </fieldset>
 
   <fieldset>
@@ -49,7 +49,7 @@
     <p>
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
       <input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}">
-      <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');">
     </p>
   </fieldset>
 
diff --git a/admin/themes/default/template/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl
index 653f07cc3..a01585df9 100644
--- a/admin/themes/default/template/thumbnail.tpl
+++ b/admin/themes/default/template/thumbnail.tpl
@@ -92,7 +92,7 @@
     </ul>
   </fieldset>
 
-  <p><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></p>
+  <p><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p>
 </form>
 {/if} {*isset params*}
 
diff --git a/admin/themes/default/template/upload.tpl b/admin/themes/default/template/upload.tpl
index 43ca5d52b..44578c715 100644
--- a/admin/themes/default/template/upload.tpl
+++ b/admin/themes/default/template/upload.tpl
@@ -42,9 +42,9 @@
 
   <p class="bottomButtons">
     <input type="hidden" name="list" value="{$LIST}">
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
-    <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}>
-    <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
+    <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}">
+    <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}">
     <input class="submit" type="reset" value="{'Reset'|@translate}">
   </p>
 
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index f8442ec12..ec0fd29f3 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -13,7 +13,7 @@
 		<label>{'Password'|@translate} <input type="text" name="password"></label>
 		{/if}
 		<label>{'Email address'|@translate} <input type="text" name="email"></label>
-    <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></label>
+    <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}"></label>
   </fieldset>
 </form>
 
@@ -103,7 +103,7 @@
 <fieldset>
   <legend>{'Deletions'|@translate}</legend>
   <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label>
-  <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}>
+  <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete">
 </fieldset>
 
 <fieldset>
@@ -312,7 +312,7 @@
 </p>
 
 <p>
-  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED}>
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit">
   <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset">
 </p>
 
diff --git a/include/template.class.php b/include/template.class.php
index 4f33a3569..6cba4984f 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -353,7 +353,6 @@ class Template {
     }
 
     $this->smarty->assign( 'ROOT_URL', get_root_url() );
-    $this->smarty->assign( 'TAG_INPUT_ENABLED', '');
 
     $save_compile_id = $this->smarty->compile_id;
     $this->load_external_filters($handle);
diff --git a/plugins/LocalFilesEditor/admin.tpl b/plugins/LocalFilesEditor/admin.tpl
index b96890fbd..85d5bb1e3 100644
--- a/plugins/LocalFilesEditor/admin.tpl
+++ b/plugins/LocalFilesEditor/admin.tpl
@@ -81,9 +81,9 @@ function unloadEditarea() {ldelim}
 
 <br>
 
-<input class="submit" type="submit" value="{'locfiledit_save_file'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
+<input class="submit" type="submit" value="{'locfiledit_save_file'|@translate}" name="submit"/>
 {if isset ($restore)}
-<input class="submit" type="submit" value="{'locfiledit_restore'|@translate}" name="restore" onclick="return confirm('{'locfiledit_restore_confirm'|@translate|escape:'javascript'}');" {$TAG_INPUT_ENABLED}/>
+<input class="submit" type="submit" value="{'locfiledit_restore'|@translate}" name="restore" onclick="return confirm('{'locfiledit_restore_confirm'|@translate|escape:'javascript'}');"/>
 {/if}
 
 {if isset ($restore_infos)}