Index: /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl	(revision 21747)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/ghosttracker.tpl	(revision 21748)
@@ -25,5 +25,5 @@
 
 <div class="titrePage">
-  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle4'|@translate}</h2>
+  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br/>{'UAM_SubTitle4'|@translate}</h2>
 </div>
 
@@ -33,8 +33,8 @@
     <ul>
 		  <li>
-        <label>{'UAM_GhostTracker_Init'|@translate}</label><br><br>
+        <label>{'UAM_GhostTracker_Init'|@translate}</label><br/><br/>
       </li>
     </ul>
-    <p><input class="submit" type="submit" value="{'UAM_GT_Reset'|@translate}" name="GhostTracker_Init" ></p>
+    <p><input class="submit" type="submit" value="{'UAM_GT_Reset'|@translate}" name="GhostTracker_Init"/></p>
   </fieldset>
   
@@ -56,7 +56,7 @@
           {foreach from=$users item=user name=users_loop}
             <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-              <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
+              <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"/></td>
               <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-              <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td>
+              <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"/></a></td>
               <td>{$user.EMAIL}</td>
             {if $user.REMINDER == l10n('UAM_Reminder_Sent_NOK')}
@@ -76,9 +76,9 @@
       <div id="pager" class="pager">
       <form>
-        <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
-        <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
-        <input type="text" class="pagedisplay">
-        <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
-        <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
+        <img src="{$UAM_PATH}admin/template/icon/first.png" class="first"/>
+        <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev"/>
+        <input type="text" class="pagedisplay"/>
+        <img src="{$UAM_PATH}admin/template/icon/next.png" class="next"/>
+        <img src="{$UAM_PATH}admin/template/icon/last.png" class="last"/>
         <select class="pagesize">
           <option  value="10">10</option>
@@ -89,15 +89,15 @@
       </form>
       </div>
-      <br>
+      <br/>
       <fieldset>
       <p>
         {'target'|@translate}
-        <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
-        <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
+        <label><input type="radio" name="target" value="all"/> {'all'|@translate}</label>
+        <label><input type="radio" name="target" value="selection" checked="checked"/> {'selection'|@translate}</label>
       </p>
 
       <p>
-        <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected" >
-        <input class="submit" type="submit" value="{'UAM_Reminder'|@translate}" name="Reminder_Email" >
+        <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected"/>
+        <input class="submit" type="submit" value="{'UAM_Reminder'|@translate}" name="Reminder_Email"/>
       </p>
       </fieldset>
Index: /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl	(revision 21747)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/global.tpl	(revision 21748)
@@ -148,5 +148,5 @@
 
 <div class="titrePage">
-  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_SubTitle1'|@translate}</h2>
+  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br/>{'UAM_SubTitle1'|@translate}</h2>
 </div>
 
@@ -154,9 +154,9 @@
 
   <p>
-    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
+    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
       &nbsp;
-    <input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit">
-    <input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"> 
-    <input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"> 
+    <input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit"/>
+    <input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"/> 
+    <input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"/> 
   </p>
 
@@ -176,11 +176,11 @@
               {'UAM_Username_Char'|@translate}
             </label>
-            <label for="UAM_Username_Char_false"><input id="UAM_Username_Char_false" type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char">
-              {'UAM_Username_Char_false'|@translate}<br>
-            </label>
-            <label for="UAM_Username_Char_true"><input id="UAM_Username_Char_true" type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char">
+            <label for="UAM_Username_Char_false"><input id="UAM_Username_Char_false" type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char"/>
+              {'UAM_Username_Char_false'|@translate}<br/>
+            </label>
+            <label for="UAM_Username_Char_true"><input id="UAM_Username_Char_true" type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char"/>
               {'UAM_Username_Char_true'|@translate}
             <div class="uam_leftmargin">
-              <input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;">
+              <input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;"/>
             </div>
             </label>
@@ -191,15 +191,15 @@
             </label>
           
-            <label for="UAM_Password_Enforced_false"><input id="UAM_Password_Enforced_false" type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced">
+            <label for="UAM_Password_Enforced_false"><input id="UAM_Password_Enforced_false" type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for="UAM_Password_Enforced_true"><input id="UAM_Password_Enforced_true" type="radio" value="true" {$UAM_PASSWORDENF_TRUE} name="UAM_Password_Enforced">
+            <label for="UAM_Password_Enforced_true"><input id="UAM_Password_Enforced_true" type="radio" value="true" {$UAM_PASSWORDENF_TRUE} name="UAM_Password_Enforced"/>
               {'UAM_Password_Enforced_true'|@translate}&nbsp;
-            <input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;">
+            <input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;"/>
             </label>
             {'UAM_PasswordTest'|@translate}
-              <input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;">
+              <input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;"/>
               &nbsp;&nbsp;&nbsp;
-              <input class="submit" type="submit" value="{'UAM_PasswordTest'|@translate}" name="PasswordTest">
+              <input class="submit" type="submit" value="{'UAM_PasswordTest'|@translate}" name="PasswordTest"/>
               &nbsp;&nbsp;&nbsp;{'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}
             
@@ -211,8 +211,8 @@
               </label>
             
-              <label for="UAM_AdminPassword_Enforced_false"><input id="UAM_AdminPassword_Enforced_false" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced" type="radio">
+              <label for="UAM_AdminPassword_Enforced_false"><input id="UAM_AdminPassword_Enforced_false" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced" type="radio"/>
                 {'UAM_Disable'|@translate}
               </label>
-              <label for="UAM_AdminPassword_Enforced_true"><input id="UAM_AdminPassword_Enforced_true" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced" type="radio">
+              <label for="UAM_AdminPassword_Enforced_true"><input id="UAM_AdminPassword_Enforced_true" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced" type="radio"/>
                 {'UAM_Enable'|@translate}
               </label>
@@ -229,8 +229,8 @@
             <div class="uam_hide">
 
-              <label for="UAM_MailExclusion_false"><input id="UAM_MailExclusion_false" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion" type="radio">
+              <label for="UAM_MailExclusion_false"><input id="UAM_MailExclusion_false" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion" type="radio"/>
                 {'UAM_Disable'|@translate}
               </label>
-              <label for="UAM_MailExclusion_true"><input id="UAM_MailExclusion_true" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion" type="radio">
+              <label for="UAM_MailExclusion_true"><input id="UAM_MailExclusion_true" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion" type="radio"/>
                 {'UAM_MailExclusion_true'|@translate}
               </label>
@@ -242,9 +242,9 @@
             </label>
 
-            <label for="UAM_MailExclusion_false"><input id="UAM_MailExclusion_false" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion" type="radio">
+            <label for="UAM_MailExclusion_false"><input id="UAM_MailExclusion_false" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion" type="radio"/>
                 {'UAM_Disable'|@translate}
             </label>
 
-            <label for="UAM_MailExclusion_true"><input id="UAM_MailExclusion_true" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion" type="radio">
+            <label for="UAM_MailExclusion_true"><input id="UAM_MailExclusion_true" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion" type="radio"/>
                 {'UAM_MailExclusion_true'|@translate}
             </label>
@@ -282,9 +282,9 @@
               {'UAM_Confirm_Mail'|@translate}
             </label>
-            <label for="UAM_Confirm_Mail_false"><input type="radio" id="UAM_Confirm_Mail_false" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail">
+            <label for="UAM_Confirm_Mail_false"><input type="radio" id="UAM_Confirm_Mail_false" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail"/>
               {'UAM_Disable'|@translate}</label>
-            <label for="UAM_Confirm_Mail_true"><input type="radio" id="UAM_Confirm_Mail_true" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">
+            <label for="UAM_Confirm_Mail_true"><input type="radio" id="UAM_Confirm_Mail_true" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail"/>
               {'UAM_Confirm_Mail_true'|@translate}</label>
-            <label for="UAM_Confirm_Mail_local"><input type="radio" id="UAM_Confirm_Mail_local" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail">
+            <label for="UAM_Confirm_Mail_local"><input type="radio" id="UAM_Confirm_Mail_local" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail"/>
               {'UAM_Confirm_Mail_local'|@translate}</label>
           </li>
@@ -297,8 +297,8 @@
                 </label>
               
-                <label for="UAM_Stuffs_false"><input id="UAM_Stuffs_false" value="false" {$UAM_STUFFS_FALSE} name="UAM_Stuffs" type="radio">
+                <label for="UAM_Stuffs_false"><input id="UAM_Stuffs_false" value="false" {$UAM_STUFFS_FALSE} name="UAM_Stuffs" type="radio"/>
                   {'UAM_Disable'|@translate}
                 </label>
-                <label for="UAM_Stuffs_true"><input id="UAM_Stuffs_true" value="true" {$UAM_STUFFS_TRUE} name="UAM_Stuffs" type="radio">
+                <label for="UAM_Stuffs_true"><input id="UAM_Stuffs_true" value="true" {$UAM_STUFFS_TRUE} name="UAM_Stuffs" type="radio"/>
                   {'UAM_Enable'|@translate}
                 </label>
@@ -310,8 +310,8 @@
                   {'UAM_AdminConfMail'|@translate}
                 </label>
-                <label for="UAM_Admin_ConfMail_false"><input id="UAM_Admin_ConfMail_false" value="false" {$UAM_ADMINCONFMAIL_FALSE} name="UAM_Admin_ConfMail" type="radio">
+                <label for="UAM_Admin_ConfMail_false"><input id="UAM_Admin_ConfMail_false" value="false" {$UAM_ADMINCONFMAIL_FALSE} name="UAM_Admin_ConfMail" type="radio"/>
                   {'UAM_Disable'|@translate}
                 </label>
-                <label for="UAM_Admin_ConfMail_true"><input id="UAM_Admin_ConfMail_true" value="true" {$UAM_ADMINCONFMAIL_TRUE} name="UAM_Admin_ConfMail" type="radio">
+                <label for="UAM_Admin_ConfMail_true"><input id="UAM_Admin_ConfMail_true" value="true" {$UAM_ADMINCONFMAIL_TRUE} name="UAM_Admin_ConfMail" type="radio"/>
                   {'UAM_Enable'|@translate}
                 </label>
@@ -364,5 +364,5 @@
             {* /if *}
 -->
-          <br><hr><br>
+          <br/><hr/><br/>
             <li>
               <label class="cluetip" title="{'UAM_confirmmail_custom_Txt1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">
@@ -389,5 +389,5 @@
           </ul>
           </fieldset>
-          <br><hr><br>
+          <br/><hr/><br/>
             <ul>
          	    <li>
@@ -396,8 +396,8 @@
                 </label>
             
-                <label for="UAM_RejectConnexion_false"><input id="UAM_RejectConnexion_false" type="radio" value="false" {$UAM_REJECTCONNECT_FALSE} name="UAM_RejectConnexion">
+                <label for="UAM_RejectConnexion_false"><input id="UAM_RejectConnexion_false" type="radio" value="false" {$UAM_REJECTCONNECT_FALSE} name="UAM_RejectConnexion"/>
                   {'UAM_Disable'|@translate}
                 </label>
-                <label for="UAM_RejectConnexion_true"><input id="UAM_RejectConnexion_true" type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion">
+                <label for="UAM_RejectConnexion_true"><input id="UAM_RejectConnexion_true" type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion"/>
                   {'UAM_Enable'|@translate}</label>
                 </label>
@@ -415,10 +415,10 @@
               </li>
             </ul>
-          <br><hr><br>
+          <br/><hr/><br/>
           <a id="show_UAM_Change" >{'UAM_Change'|translate}</a>
           <a id="hide_UAM_Change" style="display: none">{'hide details'|translate}</a>
           <ul id="UAM_Change" style="display: none">
             <div id="uam_notice">{'UAM_Confirm_grpstat_notice'|@translate}</div>
-              <br>
+              <br/>
               <li>
                 <label class="cluetip" title="{'UAM_confirmgrpTitle'|translate}|{'UAM_confirmgrpTitle_d'|translate}">
@@ -491,5 +491,5 @@
               </ul>
             </ul>
-          <br><hr><br>
+          <br/><hr/><br/>
             <ul>
               <li>
@@ -497,9 +497,9 @@
                   {'UAM_ValidationLimit_Info'|@translate}
                 </label>
-                <label for="UAM_ConfirmMail_TimeOut_false" ><input id="UAM_ConfirmMail_TimeOut_false" type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut">
+                <label for="UAM_ConfirmMail_TimeOut_false" ><input id="UAM_ConfirmMail_TimeOut_false" type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut"/>
                   {'UAM_Disable'|@translate}</label>
-                <label for="UAM_ConfirmMail_TimeOut_true" ><input id="UAM_ConfirmMail_TimeOut_true" type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut">
+                <label for="UAM_ConfirmMail_TimeOut_true" ><input id="UAM_ConfirmMail_TimeOut_true" type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut"/>
                   {'UAM_ConfirmMail_TimeOut_true'|@translate}
-                <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;">
+                <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"/>
                 </label>
               </li>
@@ -508,7 +508,7 @@
                   {'UAM_ConfirmMail_Remail'|@translate}
                 </label>
-                <label for="UAM_ConfirmMail_Remail_false" ><input id="UAM_ConfirmMail_Remail_false" type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail">
+                <label for="UAM_ConfirmMail_Remail_false" ><input id="UAM_ConfirmMail_Remail_false" type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail"/>
                   {'UAM_Disable'|@translate}</label>
-                <label for="UAM_ConfirmMail_Remail_true" ><input id="UAM_ConfirmMail_Remail_true" type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail">
+                <label for="UAM_ConfirmMail_Remail_true" ><input id="UAM_ConfirmMail_Remail_true" type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail"/>
                   {'UAM_Enable'|@translate}</label>
               </li>
@@ -549,5 +549,5 @@
                     <textarea class="uam_textfields" name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea>
                   {/if}
-                  <br>
+                  <br/>
                   </li>
 <!--
@@ -569,8 +569,8 @@
               </label>
             
-              <label for="UAM_USRAuto_false"><input id="UAM_USRAuto_false" value="false" {$UAM_USRAUTO_FALSE} name="UAM_USRAuto" type="radio">
+              <label for="UAM_USRAuto_false"><input id="UAM_USRAuto_false" value="false" {$UAM_USRAUTO_FALSE} name="UAM_USRAuto" type="radio"/>
                 {'UAM_Disable'|@translate}
               </label>
-              <label for="UAM_USRAuto_true"><input id="UAM_USRAuto_true" value="true" {$UAM_USRAUTO_TRUE} name="UAM_USRAuto" type="radio">
+              <label for="UAM_USRAuto_true"><input id="UAM_USRAuto_true" value="true" {$UAM_USRAUTO_TRUE} name="UAM_USRAuto" type="radio"/>
                 {'UAM_Enable'|@translate}
               </label>
@@ -592,8 +592,8 @@
                   {'UAM_USRAutoMail'|@translate}
                 </label>
-                <label for="UAM_USRAutoMail_false"><input id="UAM_USRAutoMail_false" value="false" {$UAM_USRAUTOMAIL_FALSE} name="UAM_USRAutoMail" type="radio">
+                <label for="UAM_USRAutoMail_false"><input id="UAM_USRAutoMail_false" value="false" {$UAM_USRAUTOMAIL_FALSE} name="UAM_USRAutoMail" type="radio"/>
                   {'UAM_Disable'|@translate}
                 </label>
-                <label for="UAM_USRAutoMail_true"><input id="UAM_USRAutoMail_true" value="true" {$UAM_USRAUTOMAIL_TRUE} name="UAM_USRAutoMail" type="radio">
+                <label for="UAM_USRAutoMail_true"><input id="UAM_USRAutoMail_true" value="true" {$UAM_USRAUTOMAIL_TRUE} name="UAM_USRAutoMail" type="radio"/>
                   {'UAM_Enable'|@translate}
                 </label>
@@ -619,11 +619,11 @@
             </label>
             <label for"UAM_GhostUser_Tracker_false">
-              <input id="UAM_GhostUser_Tracker_false" type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker">
+              <input id="UAM_GhostUser_Tracker_false" type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker"/>
               {'UAM_Disable'|@translate}
             </label>
             <label for"UAM_GhostUser_Tracker_true">
-              <input id="UAM_GhostUser_Tracker_true" type="radio" value="true" {$UAM_GHOSTRACKER_TRUE} name="UAM_GhostUser_Tracker">
+              <input id="UAM_GhostUser_Tracker_true" type="radio" value="true" {$UAM_GHOSTRACKER_TRUE} name="UAM_GhostUser_Tracker"/>
               {'UAM_GhostTracker_true'|@translate}
-            <input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;">
+            <input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;"/>
             </label>
           
@@ -666,8 +666,8 @@
               </label>
             
-              <label for="UAM_GTAuto_false"><input id="UAM_GTAuto_false" type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto">
+              <label for="UAM_GTAuto_false"><input id="UAM_GTAuto_false" type="radio" value="false" {$UAM_GTAUTO_FALSE} name="UAM_GTAuto"/>
                 {'UAM_Disable'|@translate}
               
-              <label for="UAM_GTAuto_true"><input id="UAM_GTAuto_true" type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto">
+              <label for="UAM_GTAuto_true"><input id="UAM_GTAuto_true" type="radio" value="true" {$UAM_GTAUTO_TRUE} name="UAM_GTAuto"/>
                 {'UAM_Enable'|@translate}
               </label>
@@ -733,8 +733,8 @@
                       </label>
                     
-                      <label for="UAM_GTAutoMail_false"><input id="UAM_GTAutoMail_false" value="false" {$UAM_GTAUTOMAIL_FALSE} name="UAM_GTAutoMail" type="radio">
+                      <label for="UAM_GTAutoMail_false"><input id="UAM_GTAutoMail_false" value="false" {$UAM_GTAUTOMAIL_FALSE} name="UAM_GTAutoMail" type="radio"/>
                         {'UAM_Disable'|@translate}
                       </label>
-                      <label for="UAM_GTAutoMail_true"><input id="UAM_GTAutoMail_true" value="true" {$UAM_GTAUTOMAIL_TRUE} name="UAM_GTAutoMail" type="radio">
+                      <label for="UAM_GTAutoMail_true"><input id="UAM_GTAutoMail_true" value="true" {$UAM_GTAUTOMAIL_TRUE} name="UAM_GTAutoMail" type="radio"/>
                         {'UAM_Enable'|@translate}
                       </label>
@@ -782,8 +782,8 @@
             </label>
           
-            <label for="UAM_Mail_Info_false"><input id="UAM_Mail_Info_false" type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info">
+            <label for="UAM_Mail_Info_false"><input id="UAM_Mail_Info_false" type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for="UAM_Mail_Info_true"><input id="UAM_Mail_Info_true" type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info">
+            <label for="UAM_Mail_Info_true"><input id="UAM_Mail_Info_true" type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info"/>
               {'UAM_Enable'|@translate}
             </label>
@@ -797,8 +797,8 @@
                 {'UAM_HidePassw'|@translate}
               </label>
-              <label for="UAM_HidePassw_false"><input id="UAM_HidePassw_false" value="false" {$UAM_HIDEPASSW_FALSE} name="UAM_HidePassw" type="radio">
+              <label for="UAM_HidePassw_false"><input id="UAM_HidePassw_false" value="false" {$UAM_HIDEPASSW_FALSE} name="UAM_HidePassw" type="radio"/>
                 {'UAM_Disable'|@translate}
               </label>
-              <label for="UAM_HidePassw_true"><input id="UAM_HidePassw_true" value="true" {$UAM_HIDEPASSW_TRUE} name="UAM_HidePassw" type="radio">
+              <label for="UAM_HidePassw_true"><input id="UAM_HidePassw_true" value="true" {$UAM_HIDEPASSW_TRUE} name="UAM_HidePassw" type="radio"/>
                 {'UAM_Enable'|@translate}
               </label>
@@ -838,8 +838,8 @@
             </label>
           
-            <label for="UAM_Add_LastVisit_Column_false"><input id="UAM_Add_LastVisit_Column_false" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column" type="radio">
+            <label for="UAM_Add_LastVisit_Column_false"><input id="UAM_Add_LastVisit_Column_false" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column" type="radio"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for="UAM_Add_LastVisit_Column_true"><input id="UAM_Add_LastVisit_Column_true" value="true" {$UAM_ADDLASTVISIT_TRUE} name="UAM_Add_LastVisit_Column" type="radio">
+            <label for="UAM_Add_LastVisit_Column_true"><input id="UAM_Add_LastVisit_Column_true" value="true" {$UAM_ADDLASTVISIT_TRUE} name="UAM_Add_LastVisit_Column" type="radio"/>
               {'UAM_Enable'|@translate}
           </label>
@@ -850,8 +850,8 @@
             </label>
           
-            <label for="UAM_RedirToProfile_false"><input id="UAM_RedirToProfile_false" value="false" {$UAM_REDIRTOPROFILE_FALSE} name="UAM_RedirToProfile" type="radio">
+            <label for="UAM_RedirToProfile_false"><input id="UAM_RedirToProfile_false" value="false" {$UAM_REDIRTOPROFILE_FALSE} name="UAM_RedirToProfile" type="radio"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for="UAM_RedirToProfile_true"><input id="UAM_RedirToProfile_true" value="true" {$UAM_REDIRTOPROFILE_TRUE} name="UAM_RedirToProfile" type="radio">
+            <label for="UAM_RedirToProfile_true"><input id="UAM_RedirToProfile_true" value="true" {$UAM_REDIRTOPROFILE_TRUE} name="UAM_RedirToProfile" type="radio"/>
               {'UAM_Enable'|@translate}
             </label>
@@ -864,8 +864,8 @@
             </label>
           
-            <label for="UAM_PwdReset_false"><input id="UAM_PwdReset_false" value="false" {$UAM_PWDRESET_FALSE} name="UAM_PwdReset" type="radio">
+            <label for="UAM_PwdReset_false"><input id="UAM_PwdReset_false" value="false" {$UAM_PWDRESET_FALSE} name="UAM_PwdReset" type="radio"/>
               {'UAM_Disable'|@translate}
             </label>
-            <label for="UAM_PwdReset_true"><input id="UAM_PwdReset_true" value="true" {$UAM_PWDRESET_TRUE} name="UAM_PwdReset" type="radio">
+            <label for="UAM_PwdReset_true"><input id="UAM_PwdReset_true" value="true" {$UAM_PWDRESET_TRUE} name="UAM_PwdReset" type="radio"/>
               {'UAM_Enable'|@translate}
             </label>
@@ -879,8 +879,8 @@
             </label>
           
-            <label for="UAM_CustomPasswRetr_false"><input id="UAM_CustomPasswRetr_false" value="false" {$UAM_CUSTOMPASSWRETR_FALSE} name="UAM_CustomPasswRetr" type="radio">
+            <label for="UAM_CustomPasswRetr_false"><input id="UAM_CustomPasswRetr_false" value="false" {$UAM_CUSTOMPASSWRETR_FALSE} name="UAM_CustomPasswRetr" type="radio"/>
               {'UAM_Disable'|@translate}
 </label>
-            <label for="UAM_CustomPasswRetr_true"><input id="UAM_CustomPasswRetr_true" value="true" {$UAM_CUSTOMPASSWRETR_TRUE} name="UAM_CustomPasswRetr" type="radio">
+            <label for="UAM_CustomPasswRetr_true"><input id="UAM_CustomPasswRetr_true" value="true" {$UAM_CUSTOMPASSWRETR_TRUE} name="UAM_CustomPasswRetr" type="radio"/>
               {'UAM_Enable'|@translate}
 </label>
@@ -894,5 +894,5 @@
 
   <p>
-    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit">
+    <input class="submit" type="submit" value="{'UAM_submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'UAM_audit'|@translate}" name="audit"/>
   </p>
 </form>
@@ -909,7 +909,7 @@
   <p>
     {'UAM_Dump_Download'|@translate}&nbsp;
-      <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}>
-  
-      <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}>
+      <input type="checkbox" name="dump_download" value="true" {$UAM_DUMP_DOWNLOAD}/>
+  
+      <input class="submit" type="submit" value="{'UAM_Save'|@translate}" name="save" {$TAG_INPUT_ENABLED}/>
   </p>
 </form>
@@ -919,5 +919,5 @@
   <p>
     {'UAM_Restore'|@translate}
-      <input class="submit" type="submit" value="{'UAM_Restore_File'|@translate}" name="restore" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'UAM_Restore_File'|@translate}" name="restore" {$TAG_INPUT_ENABLED}/>
   </p>
 </form>
Index: /extensions/UserAdvManager/branches/2.50/admin/template/userlist.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/userlist.tpl	(revision 21747)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/userlist.tpl	(revision 21748)
@@ -39,5 +39,5 @@
 
 <div class="titrePage">
-  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_Tracking registered users'|@translate}</h2>
+  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br/>{'UAM_Tracking registered users'|@translate}</h2>
 </div>
 
@@ -60,5 +60,5 @@
           <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
             <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td>
+            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"/></a></td>
             <td>{$user.EMAIL}</td>
             <td style="text-align:center;">{$user.LASTVISIT}</td>
@@ -81,9 +81,9 @@
 <div id="pager" class="pager">
 	<form>
-		<img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
-		<img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
-		<input type="text" class="pagedisplay">
-		<img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
-		<img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
+		<img src="{$UAM_PATH}admin/template/icon/first.png" class="first"/>
+		<img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev"/>
+		<input type="text" class="pagedisplay"/>
+		<img src="{$UAM_PATH}admin/template/icon/next.png" class="next"/>
+		<img src="{$UAM_PATH}admin/template/icon/last.png" class="last"/>
 		<select class="pagesize">
 			<option  value="10">10</option>
@@ -94,5 +94,5 @@
 	</form>
 </div>
-    	<br>
+    	<br/>
   </fieldset>
 		{else}
Index: /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl
===================================================================
--- /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl	(revision 21747)
+++ /extensions/UserAdvManager/branches/2.50/admin/template/usermanager.tpl	(revision 21748)
@@ -26,5 +26,5 @@
 
 <div class="titrePage">
-  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br>{'UAM_Tracking confirmations'|@translate}</h2>
+  <h2>{'UAM_Title_Tab'|@translate} {$UAM_VERSION}<br/>{'UAM_Tracking confirmations'|@translate}</h2>
 </div>
 
@@ -51,7 +51,7 @@
         {foreach from=$users item=user name=users_loop}
           <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-            <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
+            <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"/></td>
             <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"></a></td>
+            <td style="text-align:center;"><a href="./admin.php?page=profile&amp;user_id={$user.ID}" title="{'Profile'|@translate}" onclick="window.open(this.href); return false;"><img src="{$UAM_PATH}admin/template/icon/edit_s.png"/></a></td>
             <td>{$user.STATUS}</td>
             <td>{$user.EMAIL}</td>
@@ -71,9 +71,9 @@
         <div id="pager" class="pager">
           <form>
-            <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
-            <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
-            <input type="text" class="pagedisplay">
-            <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
-            <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
+            <img src="{$UAM_PATH}admin/template/icon/first.png" class="first"/>
+            <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev"/>
+            <input type="text" class="pagedisplay"/>
+            <img src="{$UAM_PATH}admin/template/icon/next.png" class="next"/>
+            <img src="{$UAM_PATH}admin/template/icon/last.png" class="last"/>
             <select class="pagesize">
               <option  value="10">10</option>
@@ -85,21 +85,21 @@
         </div>
       {/if}
-    	<br>
+    	<br/>
       <fieldset>
         <p>
           {'target'|@translate}
-          <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
-          <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
+          <label><input type="radio" name="target" value="all"/> {'all'|@translate}</label>
+          <label><input type="radio" name="target" value="selection" checked="checked"/> {'selection'|@translate}</label>
         </p>
 
         <p>
         {if $CONFIRM_LOCAL == "local"}
-          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
-          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
+          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected"/>
+          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation"/>
         {else}
-          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
-          <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key">
-          <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key">
-          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
+          <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected"/>
+          <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key"/>
+          <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key"/>
+          <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation"/>
         {/if}
         </p>
Index: /extensions/UserAdvManager/branches/2.50/changelog.txt.php
===================================================================
--- /extensions/UserAdvManager/branches/2.50/changelog.txt.php	(revision 21747)
+++ /extensions/UserAdvManager/branches/2.50/changelog.txt.php	(revision 21748)
@@ -409,4 +409,5 @@
 
 -- 2.50.5 : Bug 2875 fixed - MySql error on manual validation (tracking confirmation tab)
+            Bug 2876 fixed - Make templates compatible HTML 5
             Update it_IT, thanks to : salvatore
 */
