Index: extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php	(revision 6753)
+++ extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php	(revision 6754)
@@ -28,5 +28,4 @@
 $UAM_Password_Test_Score = 0;
 $UAM_Exclusionlist_Error = false;
-
 
 // +-----------------------------------------------------------------------+
@@ -119,5 +118,5 @@
       $UAM_Exclusionlist_Error = true;
     }
-		
+
 		$newconf_UAM = array(
       $_POST['UAM_Mail_Info'],
@@ -154,5 +153,4 @@
 		pwg_query($query);
 
-
 /* Email confirmation settings */
     $_POST['UAM_ConfirmMail_ReMail_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt1'])));
@@ -163,6 +161,5 @@
     
     $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])));
-
-
+    
 	  $newconf_UAM_ConfirmMail = array (
       $_POST['UAM_ConfirmMail_TimeOut'],
@@ -310,4 +307,5 @@
 		'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
 		'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
+    'UAM_CONFIRM_MAIL_LOCAL'         => $conf_UAM[1]=='local' ?  'checked="checked"' : '' ,
 		'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[10],
 		'UAM_No_Confirm_Group'           => $conf_UAM[2],
@@ -626,6 +624,6 @@
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
 	
-  if (isset($conf_UAM[1]) and $conf_UAM[1]=='true' and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
-  {
+  if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local') and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
+  {   
 // +-----------------------------------------------------------------------+
 // |                           initialization                              |
@@ -1112,5 +1110,5 @@
 
 			$expiration = expiration($local_user['id']);
-
+      
    		$template->append(
      		'users',
@@ -1135,8 +1133,23 @@
 				)
 			);
-		}
+		}   
+
+    // Check if validation of register is made by admin or visitor 
+    // If visitor, $Confirm_Local is used to mask useless buttons
+    $Confirm_Local = "";
+    
+    if ($conf_UAM[1] == 'local')
+    {
+      $Confirm_Local = $conf_UAM[1];
+    }
+    else
+    {
+      $Confirm_Local = "";
+    } 
+    
     /* Plugin version inserted */
     $template->assign(
       array(
+        'CONFIRM_LOCAL'=> $Confirm_Local,
         'UAM_VERSION'  => $version,
         'UAM_PATH'     => UAM_PATH,
Index: extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl	(revision 6753)
+++ extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl	(revision 6754)
@@ -215,5 +215,7 @@
               {'UAM_Confirm_Mail_false'|@translate}<br>
             <input type="radio" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">
-              {'UAM_Confirm_Mail_true'|@translate}
+              {'UAM_Confirm_Mail_true'|@translate}<br>
+            <input type="radio" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail">
+              {'UAM_Confirm_Mail_local'|@translate}
             <br><br>
         	</li>
Index: extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl
===================================================================
--- extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl	(revision 6753)
+++ extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl	(revision 6754)
@@ -41,5 +41,7 @@
       			<th>&nbsp;{'Groups'|@translate}&nbsp;&nbsp;</th>
       			<th>&nbsp;{'Registration_Date'|@translate}&nbsp;&nbsp;</th>
+          {if $CONFIRM_LOCAL == ""}
             <th>&nbsp;{'Reminder'|@translate}&nbsp;&nbsp;</th>
+          {/if}
     			</tr>
   			</thead>
@@ -53,5 +55,7 @@
             <td>{$user.GROUPS}</td>
             <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
+          {if $CONFIRM_LOCAL == ""}
             <td style="text-align:center;">{$user.REMINDER}</td>
+          {/if}
             {foreach from=$user.plugin_columns item=data}
               <td>{$data}</td>
@@ -87,8 +91,13 @@
 
 <p>
+{if $CONFIRM_LOCAL == "local"}
+  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
+  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
+{else}
   <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
   <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
   <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
   <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
+{/if}
 </p>
   </fieldset>
