diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl
index 6c75f4929..d23cda5c6 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl
@@ -8,7 +8,7 @@
 	      <td>
 		<table cellspacing="0" cellpadding="4">
 		  <tr>		    
-		    <td valign="middle" nowrap><a href="index.php?page=settings&id={$target_id}"><h7>Edit User</h7></a></td>
+		    <td valign="middle" nowrap><a href="index.php?page=show_user&id={$target_id}"><h7>Browse User</h7></a></td>
 		    <td valign="middle" nowrap><a href="index.php?page=createticket&user_id={$target_id}"><h7>Send Ticket</h7></a></td>
 		    {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1}
 			{if $userPermission eq 1}
@@ -72,10 +72,9 @@
 					
 					<form id="changePassword" method="post" action="index.php?page=settings&id={$target_id}">
 						<table cellpadding="1">
-						<tr><td height="3"></td></tr>
 						{if !isset($changesOther) or $changesOther eq "FALSE"}
 						<tr>
-							<td>
+							<td valign="middle">
 							Current Password:
 							</td>
 							<td>
@@ -85,14 +84,14 @@
 							</p>
 						</tr>
 						{/if}
-						<tr><td>
+						<tr><td valign="middle">
 						New Password:
 						</td><td>
 						<input type="text" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
 						{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<font color="red">{$newpass_error_message}</font>{/if}
 						</td></tr>
 							
-						<tr><td>
+						<tr><td valign="middle">
 						Confirm New Password:
 						</td><td>
 						<input type="text" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
@@ -125,6 +124,27 @@
 					<tr><td>
 						<p><h3>Change Email</h3></p>
 						
+						<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<table>
+							<tr><td valign="middle">
+							New Email:
+							</td><td>
+							<input type="text" class="input-xlarge" id="NewEmail" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
+							{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<font color="red">{$EMAIL}</font>{/if}
+							</td></tr>
+						</table>
+						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
+						<p>
+							<font color="green">The email has been changed!</green>
+						</p>
+						{/if}
+						
+						<input type="hidden" name="function" value="change_mail">
+						<input type="hidden" name="target_id" value="{$target_id}">
+						<p>
+						<input type="submit" value="Change Email"/>
+						</p>
+					</form>
 					</td></tr>
 				</table>
 			</td></tr>
@@ -136,6 +156,50 @@
 				<table cellpadding="10">
 					<tr><td>
 						<p><h3>Change Info</h3></p>
+						<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
+						<table>
+						<tr>
+							<td valign="middle">Firstname: </td>
+							<td><input type="text" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}></td>
+						</tr>
+						
+						<tr>
+							<td valign="middle">Lastname: </td>
+							<td><input type="text" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}></td>
+						</tr>	
+						
+						<tr>
+							<td valign="middle">Country: </td>
+							<td><select name="Country">
+									{foreach from=$country_array key=k item=v}
+										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
+									{/foreach}
+							</select></td>	
+						</tr>
+						<tr>
+							<td valign="middle">Gender</td>
+							<td>
+								<select name="Gender">
+									<option value="0"{if isset($Gender) and $Gender eq 0}selected="selected"{/if}>Secret</option>
+									<option value="1"{if isset($Gender) and $Gender eq 1}selected="selected"{/if}>Male</option>
+									<option value="2"{if isset($Gender) and $Gender eq 2}selected="selected"{/if}>Female</option>
+								</select></td>
+							</td>
+						</tr>
+						</table>			
+						{if isset($info_updated) and $info_updated eq "OK"}
+						<p>
+							<font color="green">The Info has been updated!</font>
+						</p>
+						{/if}
+						
+						<input type="hidden" name="function" value="change_info">
+						<input type="hidden" name="target_id" value="{$target_id}">
+
+						<p>
+						<input type="submit" value="Change Info"/>
+						</p>
+					</form>
 						
 					</td></tr>
 				</table>
@@ -148,252 +212,6 @@
       </table>
       
   </td></tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	<div class="row-fluid sortable ui-sortable">
-		<div class="box span4">
-			<div class="box-header well" data-original-title="">
-				<h2><i class="icon-th"></i> Change Password</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
-			</div>
-			<div class="box-content">
-				<div class="row-fluid">
-					<form id="changePassword" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Password</legend>
-						
-						{if !isset($changesOther) or $changesOther eq "FALSE"}
-							<div class="control-group {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}error{else if
-				isset($match_error_message) and $match_error_message neq "fail"}success{else}{/if}">
-							<label class="control-label">Current Password</label>
-								<div class="controls">
-								    <div class="input-prepend">
-									<span class="add-on" style="margin-left:5px;"><i class="icon-lock"></i></span>
-										<input type="password" class="input-xlarge" id="CurrentPass" name="CurrentPass" placeholder="Your current password" {if isset($prevCurrentPass)}value="{$prevCurrentPass}"{/if}>
-										{if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}<span class="help-inline">The password is incorrect</span>{/if}
-								    </div>
-								</div>
-							</div>
-						{/if}
-							<div class="control-group {if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($newpass_error_message) and $newpass_error_message eq "success"}success{else}{/if}">
-						<label class="control-label">New Password</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><i class="icon-tag"></i></span>
-									<input type="password" class="input-xlarge" id="NewPass" name="NewPass" placeholder="Your new password"  {if isset($prevNewPass)}value="{$prevNewPass}"{/if}>
-									{if isset($NEWPASSWORD_ERROR) and $NEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$newpass_error_message}</span>{/if}
-							   </div>
-							</div>
-						</div>
-							
-						<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
-			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
-						<label class="control-label">Confirm New Password</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><i class="icon-tags"></i></span>
-									<input type="password" class="input-xlarge" id="ConfirmNewPass" name="ConfirmNewPass" placeholder="Re-enter the new password"  {if isset($prevConfirmNewPass)}value="{$prevConfirmNewPass}"{/if}>
-									{if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}<span class="help-inline">{$confirmnewpass_error_message}</span>{/if}
-							    </div>
-							</div>
-						</div>
-						
-						
-					
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
-						<div class="alert alert-success">
-							The password has been changed!
-						</div>
-						{/if}
-						
-						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
-						<div class="alert alert-warning">
-							The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-						</div>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_password">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Change Password</button>
-							</div>
-						</div>
-					</form>		
-				</div>                   
-			</div>
-		</div><!--/span-->
-				
-		<div class="box span4">
-			<div class="box-header well" data-original-title="">
-				<h2><i class="icon-th"></i> Change Email</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
-			</div>
-			<div class="box-content">
-				<div class="row-fluid">
-					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Email</legend>
-						<div class="control-group {if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}error{/if}">
-						<label class="control-label">New Email</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><i class="icon-envelope"></i></span>
-									<input type="text" class="input-xlarge" id="NewEmail" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
-									{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<span class="help-inline">{$EMAIL}</span>{/if}
-						
-							    </div>
-							</div>
-						</div>
-						
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
-						<div class="alert alert-success">
-							The email has been changed!
-						</div>
-						{/if}
-						
-						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
-						<div class="alert alert-warning">
-							The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
-						</div>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_mail">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Change Email</button>
-							</div>
-						</div>
-					</form>
-				</div>                   
-			</div>
-		</div><!--/span-->
-				
-		<div class="box span4">
-			<div class="box-header well" data-original-title="">
-				<h2><i class="icon-th"></i> Change Info</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
-			</div>
-			<div class="box-content">
-				<div class="row-fluid">
-					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
-						<legend>Change Info</legend>
-						
-						<div class="control-group">
-						<label class="control-label">Firstname</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><i class="icon-user"></i></span>
-									<input type="text" class="input-xlarge" id="FirstName" name="FirstName" placeholder="Your firstname" {if isset($FirstName) and $FirstName neq ""}value="{$FirstName}"{/if}>
-								</div>
-							</div>
-						</div>
-						
-						<div class="control-group">
-						<label class="control-label">Lastname</label>
-							<div class="controls">
-							    <div class="input-prepend">
-								<span class="add-on" style="margin-left:5px;"><i class="icon-user"></i></span>
-									<input type="text" class="input-xlarge" id="LastName" name="LastName" placeholder="Your lastname" {if isset($LastName) and $LastName neq ""}value="{$LastName}"{/if}>
-								</div>
-							</div>
-						</div>
-						
-						<div class="control-group">
-						<label class="control-label">Country</label>
-							<div class="controls">
-								 <select name="Country">
-									{foreach from=$country_array key=k item=v}
-										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
-									{/foreach}
-								</select>	
-							</div>
-						</div>
-						
-						<div class="control-group">
-							<label class="control-label">Gender</label>
-							<div class="controls">							
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios0" value="0" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
-								      Secret
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-									<div id="uniform-optionsRadios1" class="radio"><span class="{if isset($Gender) and $Gender eq 1}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios1" value="1" {if isset($Gender) and $Gender eq 1}checked=""{/if} type="radio"></span></div>
-									Male
-								</label>
-								<div style="clear:both"></div>
-								<label class="radio">
-								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 2}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios2" value="2" {if isset($Gender) and $Gender eq 2}checked=""{/if} type="radio"></span></div>
-								      Female
-								</label>
-							</div>
-						</div>
-										
-						{if isset($info_updated) and $info_updated eq "OK"}
-						<div class="alert alert-success">
-							The Info has been updated!
-						</div>
-						{/if}
-						
-						<input type="hidden" name="function" value="change_info">
-						<input type="hidden" name="target_id" value="{$target_id}">
-						<div class="control-group">
-							<label class="control-label"></label>
-							<div class="controls">
-								<button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Change Info</button>
-							</div>
-						</div>
-					</form>
-				</div>                   
-			</div>
-		</div><!--/span-->
-	</div><!--/row-->
-			
-			
 	
 {/block}