Index: extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php	(revision 4927)
@@ -8,4 +8,6 @@
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
+
+if (!defined('NBC_UAM_PATH')) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 
 //ini_set('error_reporting', E_ALL);
@@ -16,5 +18,6 @@
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
 
-load_language('plugin.lang', NBC_UserAdvManager_PATH);
+load_language('plugin.lang', NBC_UAM_PATH);
+load_language('help/plugin.lang', NBC_UAM_PATH);
 
 $page['global'] = array();
@@ -39,13 +42,8 @@
   $page['tab'] = $_GET['tab'];
 
-//$conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
-
 $tabsheet = new tabsheet();
 $tabsheet->add('global',
                l10n('Tab_Global'),
                $my_base_url.'&amp;tab=global');
-$tabsheet->add('confirmmail',
-               l10n('Tab_ConfirmMail'),
-               $my_base_url.'&amp;tab=confirmmail');
 //if (isset($conf_nbc_UserAdvManager[20]) and $conf_nbc_UserAdvManager[20]=='true')
 //{
@@ -64,4 +62,10 @@
 
 // +-----------------------------------------------------------------------+
+// |                      Getting plugin version                           |
+// +-----------------------------------------------------------------------+
+$plugin =  PluginVer(NBC_UAM_PATH);
+$version = $plugin['version'] ;
+
+// +-----------------------------------------------------------------------+
 // |                            Tabssheet select                           |
 // +-----------------------------------------------------------------------+
@@ -75,7 +79,9 @@
 // *************************************************************************
   case 'global':
-	
+
 	if (isset($_POST['submit']) and !is_adviser() and isset($_POST['UserAdvManager_Mail_Info']) and isset($_POST['UserAdvManager_No_Casse']) and isset($_POST['UserAdvManager_Username_Char']) and isset($_POST['UserAdvManager_Confirm_Mail']) and isset($_POST['UserAdvManager_No_Comment_Anonymous']) and isset($_POST['UserAdvManager_Password_Enforced']) and isset($_POST['UserAdvManager_AdminPassword_Enforced']) and isset($_POST['UserAdvManager_GhostUser_Tracker']))
-  { 
+  {
+
+/* General configuration settings */
 		$_POST['UserAdvManager_MailInfo_Text'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UserAdvManager_MailInfo_Text']));
     
@@ -116,5 +122,26 @@
     }
 		
-		$newconf_nbc_UserAdvManager = $_POST['UserAdvManager_Mail_Info'].';'.$_POST['UserAdvManager_No_Casse'].';'.$_POST['UserAdvManager_Confirm_Mail'].';'.(isset($_POST['UserAdvManager_No_Confirm_Group'])?$_POST['UserAdvManager_No_Confirm_Group']:'').';'.(isset($_POST['UserAdvManager_Validated_Group'])?$_POST['UserAdvManager_Validated_Group']:'').';'.(isset($_POST['UserAdvManager_Validated_Status'])?$_POST['UserAdvManager_Validated_Status']:'').';'.$_POST['UserAdvManager_No_Comment_Anonymous'].';'.$_POST['UserAdvManager_Username_Char'].';'.$_POST['UserAdvManager_Username_List'].';'.(isset($_POST['UserAdvManager_No_Confirm_Status'])?$_POST['UserAdvManager_No_Confirm_Status']:'').';'.$_POST['UserAdvManager_MailInfo_Text'].';'.$_POST['UserAdvManager_ConfirmMail_Text'].';'.$_POST['UserAdvManager_MailExclusion'].';'.$_POST['UserAdvManager_MailExclusion_List'].';'.$_POST['UserAdvManager_Password_Enforced'].';'.$_POST['UserAdvManager_Password_Score'].';'.$_POST['UserAdvManager_AdminPassword_Enforced'].';'.$_POST['UserAdvManager_GhostUser_Tracker'].';'.$_POST['UserAdvManager_GhostTracker_DayLimit'].';'.$_POST['UserAdvManager_GhostTracker_ReminderText'].';'.$_POST['UserAdvManager_Add_LastVisit_Column'];
+		$newconf_nbc_UserAdvManager =
+      $_POST['UserAdvManager_Mail_Info'].';'
+      .$_POST['UserAdvManager_No_Casse'].';'
+      .$_POST['UserAdvManager_Confirm_Mail'].';'
+      .(isset($_POST['UserAdvManager_No_Confirm_Group'])?$_POST['UserAdvManager_No_Confirm_Group']:'').';'
+      .(isset($_POST['UserAdvManager_Validated_Group'])?$_POST['UserAdvManager_Validated_Group']:'').';'
+      .(isset($_POST['UserAdvManager_Validated_Status'])?$_POST['UserAdvManager_Validated_Status']:'').';'
+      .$_POST['UserAdvManager_No_Comment_Anonymous'].';'
+      .$_POST['UserAdvManager_Username_Char'].';'
+      .$_POST['UserAdvManager_Username_List'].';'
+      .(isset($_POST['UserAdvManager_No_Confirm_Status'])?$_POST['UserAdvManager_No_Confirm_Status']:'').';'
+      .$_POST['UserAdvManager_MailInfo_Text'].';'
+      .$_POST['UserAdvManager_ConfirmMail_Text'].';'
+      .$_POST['UserAdvManager_MailExclusion'].';'
+      .$_POST['UserAdvManager_MailExclusion_List'].';'
+      .$_POST['UserAdvManager_Password_Enforced'].';'
+      .$_POST['UserAdvManager_Password_Score'].';'
+      .$_POST['UserAdvManager_AdminPassword_Enforced'].';'
+      .$_POST['UserAdvManager_GhostUser_Tracker'].';'
+      .$_POST['UserAdvManager_GhostTracker_DayLimit'].';'
+      .$_POST['UserAdvManager_GhostTracker_ReminderText'].';'
+      .$_POST['UserAdvManager_Add_LastVisit_Column'];
 		
 		$conf['nbc_UserAdvManager'] = $newconf_nbc_UserAdvManager;
@@ -128,7 +155,52 @@
 		
 		pwg_query($query);
+
+
+
+/* Email confirmation settings */
+    $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1']));
+
+    $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2']));
+
+/* Control of semicolons - Replaced by dots - Warning message displayed */
+    if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'])) or (preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'])))
+    {
+      if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'])))
+      {
+        $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'] = preg_replace($pattern, $replacement, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1']);
+        $UserAdvManager_ConfirmMail_Error_Txt1 = true;
+      }
+      
+      if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'])))
+      {
+        $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'] = preg_replace($pattern, $replacement, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2']);
+        
+        $UserAdvManager_ConfirmMail_Error_Txt2 = true;
+      }
+      
+      array_push($page['errors'], l10n('mail_text_error'));
+    }
+
+	  $newconf_nbc_UserAdvManager_ConfirmMail =
+      $_POST['UserAdvManager_ConfirmMail_TimeOut'].';'
+      .$_POST['UserAdvManager_ConfirmMail_Delay'].';'
+      .$_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'].';'
+      .$_POST['UserAdvManager_ConfirmMail_Remail'].';'
+      .$_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'];
+
+    $conf['nbc_UserAdvManager_ConfirmMail'] = $newconf_nbc_UserAdvManager_ConfirmMail;
 		
+	  $query = '
+      UPDATE '.CONFIG_TABLE.'
+			SET value="'.$newconf_nbc_UserAdvManager_ConfirmMail.'"
+			WHERE param="nbc_UserAdvManager_ConfirmMail"
+			LIMIT 1
+		;';
+
+		pwg_query($query);
+
 		array_push($page['infos'], l10n('UserAdvManager_save_config'));
   }
+
 
 /* Testing password enforcement */
@@ -142,6 +214,7 @@
   }
 	
+
   $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
-	
+
 /* Group setting for unvalidated and validated users */
   $groups[-1] = '---------';
@@ -232,7 +305,9 @@
 	    );
 	}
-	
+  
   $template->assign(
     array(
+    /* Plugin version inserted */
+    'UAM_VERSION'                             => $version,
 		'UserAdvManager_MAIL_INFO_TRUE'           => $conf_nbc_UserAdvManager[0]=='true' ?  'checked="checked"' : '' ,
 		'UserAdvManager_MAIL_INFO_FALSE'          => $conf_nbc_UserAdvManager[0]=='false' ?  'checked="checked"' : '' ,
@@ -273,4 +348,20 @@
     )
   );
+
+		$conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array();		
+
+	  $template->assign(
+	  array(
+		'UserAdvManager_CONFIRMMAIL_TIMEOUT_TRUE'		=> $conf_nbc_UserAdvManager_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
+		'UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE'	=> $conf_nbc_UserAdvManager_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,
+		'UserAdvManager_CONFIRMMAIL_DELAY'					=> $conf_nbc_UserAdvManager_ConfirmMail[1],
+    'UserAdvManager_CONFIRMMAIL_REMAIL_TRUE'		=> $conf_nbc_UserAdvManager_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
+    'UserAdvManager_CONFIRMMAIL_REMAIL_FALSE'		=> $conf_nbc_UserAdvManager_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
+    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT1'		=> $conf_nbc_UserAdvManager_ConfirmMail[2],
+    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT2'		=> $conf_nbc_UserAdvManager_ConfirmMail[4],
+    'UserAdvManager_ERROR_REPORTS1'             => $UserAdvManager_ConfirmMail_Error_Txt1,
+    'UserAdvManager_ERROR_REPORTS2'             => $UserAdvManager_ConfirmMail_Error_Txt2,
+    	)
+	  );
 	
 
@@ -382,98 +473,4 @@
   break;
 
-// *************************************************************************
-// +-----------------------------------------------------------------------+
-// |                           ConfirmMail Config                          |
-// +-----------------------------------------------------------------------+
-// *************************************************************************
-  case 'confirmmail':
-	
-  $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
-	
-  if (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2]=='true')
-  {
-    if ( isset($_POST['submit']) and !is_adviser() and isset($_POST['UserAdvManager_ConfirmMail_TimeOut']) )
-		{
-	  	$_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1']));
-
-	  	$_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2']));
-
-/* Control of semicolons - Replaced by dots - Warning message displayed */
-    if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'])) or (preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'])))
-    {
-      if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'])))
-      {
-        $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'] = preg_replace($pattern, $replacement, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt1']);
-        $UserAdvManager_ConfirmMail_Error_Txt1 = true;
-      }
-      
-      if ((preg_match($pattern, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'])))
-      {
-        $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'] = preg_replace($pattern, $replacement, $_POST['UserAdvManager_ConfirmMail_ReMail_Txt2']);
-        
-        $UserAdvManager_ConfirmMail_Error_Txt2 = true;
-      }
-      
-      array_push($page['errors'], l10n('mail_text_error'));
-    }
-   		  
-	  	$newconf_nbc_UserAdvManager_ConfirmMail = $_POST['UserAdvManager_ConfirmMail_TimeOut'].';'.$_POST['UserAdvManager_ConfirmMail_Delay'].';'.$_POST['UserAdvManager_ConfirmMail_ReMail_Txt1'].';'.$_POST['UserAdvManager_ConfirmMail_Remail'].';'.$_POST['UserAdvManager_ConfirmMail_ReMail_Txt2'];
-		  
-//NODO:Adding new option [Auto deletion : True | False] - No access to cron functionnalities
-
-	  	$conf['nbc_UserAdvManager_ConfirmMail'] = $newconf_nbc_UserAdvManager_ConfirmMail;
-		
-	  	$query = '
-	    	UPDATE '.CONFIG_TABLE.'
-				SET value="'.$newconf_nbc_UserAdvManager_ConfirmMail.'"
-				WHERE param="nbc_UserAdvManager_ConfirmMail"
-				LIMIT 1
-			;';
-		
-			pwg_query($query);
-		
-			array_push($page['infos'], l10n('UserAdvManager_save_config'));
-		}
-	
-		$conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array();		
-
-	  $template->assign(
-	  array(
-		'UserAdvManager_CONFIRMMAIL_TIMEOUT_TRUE'		=> $conf_nbc_UserAdvManager_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
-		'UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE'	=> $conf_nbc_UserAdvManager_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,
-		'UserAdvManager_CONFIRMMAIL_DELAY'					=> $conf_nbc_UserAdvManager_ConfirmMail[1],
-    'UserAdvManager_CONFIRMMAIL_REMAIL_TRUE'		=> $conf_nbc_UserAdvManager_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
-    'UserAdvManager_CONFIRMMAIL_REMAIL_FALSE'		=> $conf_nbc_UserAdvManager_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
-    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT1'		=> $conf_nbc_UserAdvManager_ConfirmMail[2],
-    'UserAdvManager_CONFIRMMAIL_REMAIL_TXT2'		=> $conf_nbc_UserAdvManager_ConfirmMail[4],
-    'UserAdvManager_ERROR_REPORTS1'             => $UserAdvManager_ConfirmMail_Error_Txt1,
-    'UserAdvManager_ERROR_REPORTS2'             => $UserAdvManager_ConfirmMail_Error_Txt2,
-    	)
-	  );		
-
-// +-----------------------------------------------------------------------+
-// |                             errors display                            |
-// +-----------------------------------------------------------------------+
-		if ( isset ($errors) and count($errors) != 0)
-		{
-	  	$template->assign('errors',array());
-			foreach ($errors as $error)
-	  	{
-				array_push($page['errors'], $error);
-	  	}
- 		}  
-
-// +-----------------------------------------------------------------------+
-// |                           templates display                           |
-// +-----------------------------------------------------------------------+
-		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/confirmmail.tpl');
-    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');		
-  }
-  else
-  {
-		array_push($page['infos'], l10n('Err_ConfirmMail_Settings'));
-  }
-  break;
-
 
 // *************************************************************************
@@ -592,14 +589,20 @@
         
       }
+      /* Plugin version inserted */
+      $template->assign(
+        array(
+          'UAM_VERSION' => $version,
+          )
+        );
 
    		$template->append(
      		'users',
        	array(
-       		'ID'         => $local_user['id'],
-         	'USERNAME'   => stripslashes($local_user['username']),
-					'EMAIL'      => get_email_address_as_display_text($local_user['email']),
-          'LASTVISIT'  => $local_user['lastvisit'],
-          'DAYS'       => $deltadays,
-          'DISPLAY'    => $display,
+       		'ID'          => $local_user['id'],
+         	'USERNAME'    => stripslashes($local_user['username']),
+					'EMAIL'       => get_email_address_as_display_text($local_user['email']),
+          'LASTVISIT'   => $local_user['lastvisit'],
+          'DAYS'        => $deltadays,
+          'DISPLAY'     => $display,
 				)
 			);
@@ -1126,5 +1129,5 @@
 
 			$expiration = expiration($local_user['id']);
-              
+
    		$template->append(
      		'users',
@@ -1150,4 +1153,10 @@
 			);
 		}
+    /* Plugin version inserted */
+    $template->assign(
+      array(
+        'UAM_VERSION'      => $version,
+      )
+    );
 
 // +-----------------------------------------------------------------------+
@@ -1459,7 +1468,7 @@
 /* Hide radio-button if not allow to assign adviser */
 		if ($conf['allow_adviser'])
-    	{
-      	$template->assign('adviser', true);
-    	}
+    {
+      $template->assign('adviser', true);
+   	}
 
 // +-----------------------------------------------------------------------+
@@ -1497,21 +1506,19 @@
       $visible_user_list[] = $local_user;
 		}
-
-    $reminder = '';
+        
+		foreach ($visible_user_list as $local_user)
+    {
+      $reminder = '';
     
-    if (isset($local_user['reminder']) and $local_user['reminder'] == 'true')
-    {
-      $reminder = l10n('Reminder_Sent_OK');
-    }
-    else if (isset($local_user['reminder']) and $local_user['reminder'] == 'false')
-    {
-      $reminder = l10n('Reminder_Sent_NOK');
-    }
-
-		foreach ($visible_user_list as $local_user)
-    {
-	  	if (isset($_POST['pref_submit'])
-    		and isset($_POST['selection'])
-      	and in_array($local_user['id'], $_POST['selection']))
+      if (isset($local_user['reminder']) and $local_user['reminder'] == 'true')
+      {
+        $reminder = l10n('Reminder_Sent_OK');
+      }
+      else if (isset($local_user['reminder']) and $local_user['reminder'] == 'false')
+      {
+        $reminder = l10n('Reminder_Sent_NOK');
+      }
+    
+      if (isset($_POST['pref_submit']) and isset($_POST['selection']) and in_array($local_user['id'], $_POST['selection']))
 	  	{
 				$checked = 'checked="checked"';
@@ -1521,14 +1528,20 @@
     		$checked = '';
     	}
-
-   		$template->append(
-     		'users',
+      /* Plugin version inserted */
+      $template->assign(
+        array(
+          'UAM_VERSION'      => $version,
+        )
+      );
+
+      $template->append(
+     	  'users',
        	array(
-       		'ID'         => $local_user['id'],
-         	'CHECKED'    => $checked,
-         	'USERNAME'   => stripslashes($local_user['username']),
-					'EMAIL'      => get_email_address_as_display_text($local_user['email']),
-          'LASTVISIT'  => $local_user['lastvisit'],
-          'REMINDER'   => $reminder,
+       		'ID'          => $local_user['id'],
+         	'CHECKED'     => $checked,
+         	'USERNAME'    => stripslashes($local_user['username']),
+					'EMAIL'       => get_email_address_as_display_text($local_user['email']),
+          'LASTVISIT'   => $local_user['lastvisit'],
+          'REMINDER'    => $reminder,
 				)
 			);
Index: extensions/NBC_UserAdvManager/trunk/admin/confirmmail.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/confirmmail.tpl	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/confirmmail.tpl	(revision 4927)
@@ -1,4 +1,4 @@
 <div class="titrePage">
-  <h2>{'Title_Tab2'|@translate}</h2>
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle2'|@translate}</h2>
 </div>
 
Index: extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl	(revision 4927)
@@ -1,4 +1,4 @@
 ﻿<div class="titrePage">
-  <h2>{'Title_Tab4'|@translate}</h2>
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle4'|@translate}</h2>
 </div>
 
Index: extensions/NBC_UserAdvManager/trunk/admin/global.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/global.tpl	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/global.tpl	(revision 4927)
@@ -1,173 +1,267 @@
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
+
+<script type="text/javascript">
+jQuery().ready(function(){ldelim}
+  jQuery('.cluetip').cluetip({ldelim}
+    width: 500,
+    splitTitle: '|'
+  });
+});
+</script>
+
 <div class="titrePage">
-  <h2>{'Title_Tab1'|@translate}</h2>
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle1'|@translate}</h2>
 </div>
 
 <form method="post" action="{$UserAdvManager_F_ACTION}" class="general">
+
+<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
+
+<div id="instructionConfig1" class="instructionBlock" >
+
+  <div id="config1_header" class="instructionBlockHeaderCollapsed" onclick="blockToggleDisplay('config1_header', 'Config1')">
+    <span class="cluetip" title="{'UAM_restricTitle'|translate}|{'UAM_restricTitle_d'|translate}">{'UserAdvManager_Title1'|@translate}</span>
+  </div>
+
+  <div id="Config1" class="instructionBlockContent" style="display:none">
   <fieldset>
-  	<legend>{'UserAdvManager_Title1'|@translate}</legend>
     <ul>
-    	<li><label>{'UserAdvManager_No_Casse'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_NO_CASSE_TRUE} name="UserAdvManager_No_Casse">{'UserAdvManager_No_Casse_true'|@translate}<br>
+    	<li><label class="cluetip" title="{'UAM_casenTitle'|translate}|{'UAM_casenTitle_d'|translate}">{'UserAdvManager_No_Casse'|@translate}</label><br><br>
         <input type="radio" value="false" {$UserAdvManager_NO_CASSE_FALSE} name="UserAdvManager_No_Casse">{'UserAdvManager_No_Casse_false'|@translate}<br>
-    	<br>
+        <input type="radio" value="true" {$UserAdvManager_NO_CASSE_TRUE} name="UserAdvManager_No_Casse">{'UserAdvManager_No_Casse_true'|@translate}<br><br>
    		</li>
-    	<li><label>{'UserAdvManager_Username_Char'|@translate}</label><br>
+      
+    	<li><label class="cluetip" title="{'UAM_carexcTitle'|translate}|{'UAM_carexcTitle_d'|translate}">{'UserAdvManager_Username_Char'|@translate}</label><br><br>
+        <input type="radio" value="false" {$UserAdvManager_USERNAME_CHAR_FALSE} name="UserAdvManager_Username_Char">{'UserAdvManager_Username_Char_false'|@translate}<br>
         <input type="radio" value="true" {$UserAdvManager_USERNAME_CHAR_TRUE} name="UserAdvManager_Username_Char">{'UserAdvManager_Username_Char_true'|@translate}
-        <input type="text" name="UserAdvManager_Username_List" value="{$UserAdvManager_USERNAME_CHAR_LIST}" size="20" style="text-align: center;"><br>
-        <input type="radio" value="false" {$UserAdvManager_USERNAME_CHAR_FALSE} name="UserAdvManager_Username_Char">{'UserAdvManager_Username_Char_false'|@translate}<br><br>
+        <div style="margin-left: 2em"><input type="text" name="UserAdvManager_Username_List" value="{$UserAdvManager_USERNAME_CHAR_LIST}" size="20" style="text-align: center;"></div><br><br>
     	</li>
       
-    	<li><label>{'UserAdvManager_Password_Enforced'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_PASSWORDENF_TRUE} name="UserAdvManager_Password_Enforced">{'UserAdvManager_Password_Enforced_true'|@translate}
-        <input type="text" name="UserAdvManager_Password_Score" value="{$UserAdvManager_PASSWORD_SCORE}" size="5" style="text-align: center;"><br><br>
-
-{if $UserAdvManager_PASSWORDENF_TRUE}        
-        <label>{'UserAdvManager_Password_Enforced_Info'|@translate}</label><br><br>
-        {'UserAdvManager_PasswordTest'|@translate}<input type="text" name="UserAdvManager_Password_Test" value="{$UserAdvManager_PASSWORD_TEST}" size="50" style="text-align: left;">&nbsp;&nbsp;&nbsp;
-        <input class="submit" type="submit" value="{'PasswordTest'|@translate}" name="PasswordTest" >&nbsp;&nbsp;&nbsp;
+    	<li><label class="cluetip" title="{'UAM_passwTitle'|translate}|{'UAM_passwTitle_d'|translate}">{'UserAdvManager_Password_Enforced'|@translate}</label><br><br>
+        <input type="radio" value="false" {$UserAdvManager_PASSWORDENF_FALSE} name="UserAdvManager_Password_Enforced">{'UserAdvManager_Password_Enforced_false'|@translate}<br>
+        <input type="radio" value="true" {$UserAdvManager_PASSWORDENF_TRUE} name="UserAdvManager_Password_Enforced">{'UserAdvManager_Password_Enforced_true'|@translate}&nbsp;<input type="text" name="UserAdvManager_Password_Score" value="{$UserAdvManager_PASSWORD_SCORE}" size="5" style="text-align: center;"><br><br>
+
+        {'UserAdvManager_PasswordTest'|@translate}<input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UserAdvManager_Password_Test" value="{$UserAdvManager_PASSWORD_TEST}" size="50" style="text-align: left;">&nbsp;&nbsp;&nbsp;
+        <input class="submit" type="submit" value="{'PasswordTest'|@translate}" name="PasswordTest" onclick="blockToggleDisplay('config1_header', 'Config1')">&nbsp;&nbsp;&nbsp;
         {'UserAdvManager_ScoreTest'|@translate}{$UserAdvManager_PASSWORD_TEST_SCORE}<br><br>
-{/if}        
-        <input type="radio" value="false" {$UserAdvManager_PASSWORDENF_FALSE} name="UserAdvManager_Password_Enforced">{'UserAdvManager_Password_Enforced_false'|@translate}<br><br>
     	</li>
 
-        <li><label>{'UserAdvManager_AdminPassword_Enforced'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_ADMINPASSWENF_TRUE} name="UserAdvManager_AdminPassword_Enforced">{'UserAdvManager_AdminPassword_Enforced_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_ADMINPASSWENF_FALSE} name="UserAdvManager_AdminPassword_Enforced">{'UserAdvManager_AdminPassword_Enforced_false'|@translate}<br><br>
-
-    	<li><label>{'UserAdvManager_No_Comment_Anonymous'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_NO_COMMENT_ANO_TRUE} name="UserAdvManager_No_Comment_Anonymous">{'UserAdvManager_No_Comment_Anonymous_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_NO_COMMENT_ANO_FALSE} name="UserAdvManager_No_Comment_Anonymous">{'UserAdvManager_No_Comment_Anonymous_false'|@translate}<br><br>
-    	</li>
-      
-    	<li><label>{'UserAdvManager_MailExclusion'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_MAILEXCLUSION_TRUE} name="UserAdvManager_MailExclusion">{'UserAdvManager_MailExclusion_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_MAILEXCLUSION_FALSE} name="UserAdvManager_MailExclusion">{'UserAdvManager_MailExclusion_false'|@translate}<br><br>
+      <ul>
+      <li><label class="cluetip" title="{'UAM_passwadmTitle'|translate}|{'UAM_passwadmTitle_d'|translate}">{'UserAdvManager_AdminPassword_Enforced'|@translate}</label><br><br>
+        <input type="radio" value="false" {$UserAdvManager_ADMINPASSWENF_FALSE} name="UserAdvManager_AdminPassword_Enforced">{'UserAdvManager_AdminPassword_Enforced_false'|@translate}<br>        
+        <input type="radio" value="true" {$UserAdvManager_ADMINPASSWENF_TRUE} name="UserAdvManager_AdminPassword_Enforced">{'UserAdvManager_AdminPassword_Enforced_true'|@translate}<br><br>
+      </li>
+      </ul>
+      
+    	<li><label class="cluetip" title="{'UAM_mailexcTitle'|translate}|{'UAM_mailexcTitle_d'|translate}">{'UserAdvManager_MailExclusion'|@translate}</label><br><br>
+        <input type="radio" value="false" {$UserAdvManager_MAILEXCLUSION_FALSE} name="UserAdvManager_MailExclusion">{'UserAdvManager_MailExclusion_false'|@translate}<br>
+        <input type="radio" value="true" {$UserAdvManager_MAILEXCLUSION_TRUE} name="UserAdvManager_MailExclusion">{'UserAdvManager_MailExclusion_true'|@translate}<br><br>
     	</li>
 
 {if $UserAdvManager_MAILEXCLUSION_TRUE}
   {if $UserAdvManager_ERROR_REPORTS4}     
-    	<li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>
-        <textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea><br><br>
-    	</li>
-  {else}
-    	<li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>
-        <textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea><br><br>
-    	</li>
-  {/if}
-{else}
-    	<li><label>{'UserAdvManager_MailExclusion_List'|@translate}</label><br>
-        <textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea><br><br>
-    	</li>
-{/if}
-
-    	<li><label>{'UserAdvManager_GhostTracker'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_GHOSTRACKER_TRUE} name="UserAdvManager_GhostUser_Tracker">{'UserAdvManager_GhostTracker_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_GHOSTRACKER_FALSE} name="UserAdvManager_GhostUser_Tracker">{'UserAdvManager_GhostTracker_false'|@translate}<br><br>
-    	</li>
+      <div style="margin-left: 2em"><textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea></div><br><br>
+  {else}
+      <div style="margin-left: 2em"><textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea></div><br><br>
+  {/if}
+{else}
+      <div style="margin-left: 2em"><textarea name="UserAdvManager_MailExclusion_List" id="UserAdvManager_MailExclusion_List" rows="3" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILEXCLUSION_LIST}</textarea></div><br><br>
+{/if}
+    </ul>
+  </fieldset>
+  </div>
+</div>
+
+
+
+
+<div id="instructionConfig2" class="instructionBlock" >
+    
+  <div id="config2_header" class="instructionBlockHeaderCollapsed" onclick="blockToggleDisplay('config2_header', 'Config2')">
+    <span class="cluetip" title="{'UAM_confirmTitle'|translate}|{'UAM_confirmTitle_d'|translate}">{'UserAdvManager_Title2'|@translate}</span>
+  </div>
+  
+  <div id="Config2" class="instructionBlockContent" style="display:none">
+    <fieldset>
+      <ul>
+      	<li><label class="cluetip" title="{'UAM_infomailTitle'|translate}|{'UAM_infomailTitle_d'|translate}">{'UserAdvManager_Mail_Info'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_MAIL_INFO_FALSE} name="UserAdvManager_Mail_Info">{'UserAdvManager_Mail_Info_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_MAIL_INFO_TRUE} name="UserAdvManager_Mail_Info">{'UserAdvManager_Mail_Info_true'|@translate}<br><br>
+      	</li>
+        <ul>
+{if $UserAdvManager_MAIL_INFO_TRUE}
+  {if $UserAdvManager_ERROR_REPORTS1}      
+          <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" style="color: red"  {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
+          </li>
+  {else}
+          <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
+          </li>
+  {/if}
+{else}
+          <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
+          </li>
+{/if}
+        </ul>
+
+      	<li><label>{'UserAdvManager_Confirm_Mail'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_CONFIRM_MAIL_FALSE} name="UserAdvManager_Confirm_Mail">{'UserAdvManager_Confirm_Mail_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_CONFIRM_MAIL_TRUE} name="UserAdvManager_Confirm_Mail">{'UserAdvManager_Confirm_Mail_true'|@translate}<br><br>
+      	</li>
+
+        <ul>
+{if $UserAdvManager_CONFIRM_MAIL_TRUE}
+  {if $UserAdvManager_ERROR_REPORTS2}     
+          <li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
+          </li>
+  {else}
+          <li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
+          </li>
+  {/if}
+{else}
+          <li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
+          </li>
+{/if}
+        </ul>
+
+        <br><hr><br>
+        
+        <li><label>{'UserAdvManager_Confirm_Group'|@translate}</label><br><br>
+        
+          <div style="text-align: center; font-size: 1.1em; color: red;"><b>{'UserAdvManager_Confirm_Group_Notice'|@translate}</b></div><br>
+        </li>
+
+        <ul>
+          <li><label>{'UserAdvManager_No_Confirm_Group'|@translate}</label><br>
+            <div style="margin-left: 2em">{html_options name="UserAdvManager_No_Confirm_Group" options=$No_Confirm_Group.group_options selected=$No_Confirm_Group.group_selected}</div><br><br>
+            </li>
+      
+          <li><label>{'UserAdvManager_Validated_Group'|@translate}</label><br>
+            <div style="margin-left: 2em">{html_options name="UserAdvManager_Validated_Group" options=$Validated_Group.group_options selected=$Validated_Group.group_selected}</div><br><br>
+          </li>
+        </ul>
+
+        <li><label>{'UserAdvManager_Confirm_Status'|@translate}</label><br><br>
+          <div style="text-align: center; font-size: 1.1em; color: red;"><b>{'UserAdvManager_Confirm_Status_Notice'|@translate}</b></div><br>
+        </li>
+
+        <ul>
+          <li><label>{'UserAdvManager_No_Confirm_Status'|@translate}</label><br>
+            <div style="margin-left: 2em">{html_options name="UserAdvManager_No_Confirm_Status" options=$No_Confirm_Status.Status_options selected=$No_Confirm_Status.Status_selected}</div><br><br>
+          </li>
+
+          <li><label>{'UserAdvManager_Validated_Status'|@translate}</label><br>
+            <div style="margin-left: 2em">{html_options name="UserAdvManager_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}</div><br><br>
+          </li>
+        </ul>
+
+        <br><hr><br>
+
+        <li><label>{'UserAdvManager_ConfirmMail_Info'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_FALSE} name="UserAdvManager_ConfirmMail_TimeOut"> {'UserAdvManager_ConfirmMail_TimeOut_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_CONFIRMMAIL_TIMEOUT_TRUE} name="UserAdvManager_ConfirmMail_TimeOut"> {'UserAdvManager_ConfirmMail_TimeOut_true'|@translate}<input type="text" name="UserAdvManager_ConfirmMail_Delay" value="{$UserAdvManager_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"><br><br>
+        </li>
+    
+        <li><label>{'UserAdvManager_ConfirmMail_Remail'|@translate}</label><br>
+          <input type="radio" value="false" {$UserAdvManager_CONFIRMMAIL_REMAIL_FALSE} name="UserAdvManager_ConfirmMail_Remail"> {'UserAdvManager_ConfirmMail_Remail_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_CONFIRMMAIL_REMAIL_TRUE} name="UserAdvManager_ConfirmMail_Remail"> {'UserAdvManager_ConfirmMail_Remail_true'|@translate}<br><br>
+        </li>
+
+        <ul>
+{if $UserAdvManager_CONFIRMMAIL_REMAIL_TRUE}
+  {if $UserAdvManager_ERROR_REPORTS1}
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt1'|@translate}</label><br>
+          <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt1" id="UserAdvManager_ConfirmMail_ReMail_Txt1" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
+        </li>
+  {else}
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt1'|@translate}</label><br>
+          <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt1" id="UserAdvManager_ConfirmMail_ReMail_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
+        </li>
+  {/if}
+{else}
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt1'|@translate}</label><br>
+          <textarea  name="UserAdvManager_ConfirmMail_ReMail_Txt1" id="UserAdvManager_ConfirmMail_ReMail_Txt1" rows="10" cols="80" readonly{$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
+        </li>
+{/if}
+
+{if $UserAdvManager_CONFIRMMAIL_REMAIL_TRUE}
+  {if $UserAdvManager_ERROR_REPORTS2}
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt2'|@translate}</label><br>
+          <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt2" id="UserAdvManager_ConfirmMail_ReMail_Txt2" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
+        </li>
+  {else}		
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt2'|@translate}</label><br>
+          <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt2" id="UserAdvManager_ConfirmMail_ReMail_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
+        </li>
+  {/if}
+{else}
+        <li><label>{'UserAdvManager_ConfirmMail_ReMail_Txt2'|@translate}</label><br>
+          <textarea name="UserAdvManager_ConfirmMail_ReMail_Txt2" id="UserAdvManager_ConfirmMail_ReMail_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_REMAIL_TXT2}</textarea><br><br>
+        </li>
+{/if}
+        </ul>
+      </ul>
+    </fieldset>
+  </div>
+</div>
+
+
+<div id="instructionConfig3" class="instructionBlock" >
+    
+  <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick="blockToggleDisplay('config3_header', 'Config3')">
+    <span class="cluetip" title="{'UAM_miscTitle'|translate}|{'UAM_miscTitle_d'|translate}">{'UserAdvManager_Title3'|@translate}</span>
+  </div>
+  
+  <div id="Config3" class="instructionBlockContent" style="display:none">
+    <fieldset>
+      <ul>
+        <li><label>{'UserAdvManager_GhostTracker'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_GHOSTRACKER_FALSE} name="UserAdvManager_GhostUser_Tracker">{'UserAdvManager_GhostTracker_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_GHOSTRACKER_TRUE} name="UserAdvManager_GhostUser_Tracker">{'UserAdvManager_GhostTracker_true'|@translate}<input type="text" name="UserAdvManager_GhostTracker_DayLimit" value="{$UserAdvManager_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;">
+          <br>{'UserAdvManager_GhostTracker_Notice1'|@translate}<br>
+        </li>
 {if $UserAdvManager_GHOSTRACKER_TRUE}
-    	<br>
-			<div style="text-align: left; color: green;"><b>{'UserAdvManager_GhostTracker_Notice'|@translate}</b></div>
-			<br>
-{/if}
-    	<li><label>{'UserAdvManager_GhostTracker_DayLimit'|@translate}</label><br>
-        <input type="text" name="UserAdvManager_GhostTracker_DayLimit" value="{$UserAdvManager_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;"><br><br>
-      </li>
-      
+        <div style="text-align: left; color: green;"><b>{'UserAdvManager_GhostTracker_Notice'|@translate}</b></div>
+        <br>
+{/if}
+        <br>
+        <ul>
 {if $UserAdvManager_GHOSTRACKER_TRUE}
   {if $UserAdvManager_ERROR_REPORTS3}
-    	<li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
-    	</li>
-  {else}
-    	<li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
-    	</li>
-  {/if}
-{else}
-    	<li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
-    	</li>
-{/if}
-
-    	<li><label>{'UserAdvManager_Add_LastVisit_Column'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_ADDLASTVISIT_TRUE} name="UserAdvManager_Add_LastVisit_Column">{'UserAdvManager_Add_LastVisit_Column_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_ADDLASTVISIT_FALSE} name="UserAdvManager_Add_LastVisit_Column">{'UserAdvManager_Add_LastVisit_Column_false'|@translate}<br><br>
-    	</li>
-    </ul>
-    
-  	<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
-  </fieldset>
-
-    <fieldset>
-    <legend>{'UserAdvManager_Title2'|@translate}</legend>
-    <ul>
-    	<li><label>{'UserAdvManager_Mail_Info'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_MAIL_INFO_TRUE} name="UserAdvManager_Mail_Info">{'UserAdvManager_Mail_Info_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_MAIL_INFO_FALSE} name="UserAdvManager_Mail_Info">{'UserAdvManager_Mail_Info_false'|@translate}<br><br>
-    	</li>
-
-{if $UserAdvManager_MAIL_INFO_TRUE}
-  {if $UserAdvManager_ERROR_REPORTS1}      
-    	<li><label>{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" style="color: red"  {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
-    	</li>
-  {else}
-    	<li><label>{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
-    	</li>
-  {/if}
-{else}
-    	<li><label>{'UserAdvManager_MailInfo_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_MailInfo_Text" id="UserAdvManager_MailInfo_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_MAILINFO_TEXT}</textarea><br><br>
-    	</li>
-{/if}
-
-    	<li><label>{'UserAdvManager_Confirm_Mail'|@translate}</label><br>
-        <input type="radio" value="true" {$UserAdvManager_CONFIRM_MAIL_TRUE} name="UserAdvManager_Confirm_Mail">{'UserAdvManager_Confirm_Mail_true'|@translate}<br>
-        <input type="radio" value="false" {$UserAdvManager_CONFIRM_MAIL_FALSE} name="UserAdvManager_Confirm_Mail">{'UserAdvManager_Confirm_Mail_false'|@translate}<br><br>
-    	</li>
-
-{if $UserAdvManager_CONFIRM_MAIL_TRUE}
-  {if $UserAdvManager_ERROR_REPORTS2}     
-    	<li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
-    	</li>
-  {else}
-    	<li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
-    	</li>
-  {/if}
-{else}
-    	<li><label>{'UserAdvManager_ConfirmMail_Text'|@translate}</label><br><br>
-        <textarea name="UserAdvManager_ConfirmMail_Text" id="UserAdvManager_ConfirmMail_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_CONFIRMMAIL_TEXT}</textarea><br><br>
-    	</li>
-{/if}
-
-    	<br>
-			<div style="text-align: center; font-size: 1.1em; color: red;"><b>{'UserAdvManager_Confirm_Group_Notice'|@translate}</b></div>
-			<br>
-      
-    	<li><label>{'UserAdvManager_No_Confirm_Group'|@translate}</label><br>
-		{html_options name="UserAdvManager_No_Confirm_Group" options=$No_Confirm_Group.group_options selected=$No_Confirm_Group.group_selected}<br><br>
-    	</li>
-      
-    	<li><label>{'UserAdvManager_Validated_Group'|@translate}</label><br>
-		{html_options name="UserAdvManager_Validated_Group" options=$Validated_Group.group_options selected=$Validated_Group.group_selected}<br><br>
-    	</li>
-      
-    	<br>
-			<div style="text-align: center; font-size: 1.1em; color: red;"><b>{'UserAdvManager_Confirm_Status_Notice'|@translate}</b></div>
-			<br>
-      
-    	<li><label>{'UserAdvManager_No_Confirm_Status'|@translate}</label><br>
-		{html_options name="UserAdvManager_No_Confirm_Status" options=$No_Confirm_Status.Status_options selected=$No_Confirm_Status.Status_selected}<br><br>
-    	</li>
-      
-    	<li><label>{'UserAdvManager_Validated_Status'|@translate}</label><br>
-		{html_options name="UserAdvManager_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}<br><br>
-    	</li>
-    </ul>
-    
-  	<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
-  </fieldset>
+          <li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
+          </li>
+  {else}
+          <li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
+          </li>
+  {/if}
+{else}
+          <li><label>{'UserAdvManager_GhostTracker_ReminderText'|@translate}</label><br><br>
+            <textarea name="UserAdvManager_GhostTracker_ReminderText" id="UserAdvManager_GhostTracker_ReminderText" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UserAdvManager_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
+          </li>
+{/if}
+        </ul>
+    
+        <li><label>{'UserAdvManager_Add_LastVisit_Column'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_ADDLASTVISIT_FALSE} name="UserAdvManager_Add_LastVisit_Column">{'UserAdvManager_Add_LastVisit_Column_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_ADDLASTVISIT_TRUE} name="UserAdvManager_Add_LastVisit_Column">{'UserAdvManager_Add_LastVisit_Column_true'|@translate}<br><br>
+        </li>
+
+        <li><label>{'UserAdvManager_No_Comment_Anonymous'|@translate}</label><br><br>
+          <input type="radio" value="false" {$UserAdvManager_NO_COMMENT_ANO_FALSE} name="UserAdvManager_No_Comment_Anonymous">{'UserAdvManager_No_Comment_Anonymous_false'|@translate}<br>
+          <input type="radio" value="true" {$UserAdvManager_NO_COMMENT_ANO_TRUE} name="UserAdvManager_No_Comment_Anonymous">{'UserAdvManager_No_Comment_Anonymous_true'|@translate}<br><br>
+        </li>
+      </ul>
+    </fieldset>
+  </div>
+</div>
+
+<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
 </form>
Index: extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl	(revision 4927)
@@ -1,4 +1,4 @@
 ﻿<div class="titrePage">
-  <h2>{'Title_Tab5'|@translate}</h2>
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle5'|@translate}</h2>
 </div>
 
Index: extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl	(revision 4544)
+++ extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl	(revision 4927)
@@ -1,4 +1,4 @@
 ﻿<div class="titrePage">
-  <h2>{'Title_Tab3'|@translate}</h2>
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle3'|@translate}</h2>
 </div>
 
