diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php
index 4e0e25df8..c94d6386e 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php
@@ -123,4 +123,10 @@ class WebUsers extends Users{
         return $reply;
     }
     
+    public function getUsers(){
+        global $cfg;
+        $dbl = new DBLayer($cfg['db']['web']);
+        $data = $dbl->executeWithoutParams("SELECT * FROM ams_user");
+        return $data;
+    }
 }
\ No newline at end of file
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php
index 45ee8f929..4bbe9ea24 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php
@@ -32,13 +32,17 @@ function change_info(){
                         $values['fName'] = $_POST['FirstName'];
                     }
                     if(($_POST['LastName'] != "") && ($_POST['LastName'] != $current_info['LastName'])){
-                        $query = $query . "LastName = :lName ";
+			if($updated){
+			 $query = $query . ", LastName = :lName ";
+			}else{
+			 $query = $query . "LastName = :lName ";
+			}
                         $updated = true;
                         $values['lName'] = $_POST['LastName'];
                     }
                     //TODO: add the other fields too
                     $query = $query . "WHERE Login = :user";
-                    
+
                     //if some field is update then:
                     if($updated){
                         global $cfg;
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
index 7fd264aa2..9a4cc1ad6 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/settings.php
@@ -4,12 +4,17 @@ function settings(){
     if(WebUsers::isLoggedIn()){
             //in case id-GET param set it's value as target_id, if no id-param is given, ue the session id.
             if(isset($_GET['id'])){
-                $result = WebUsers::getInfo($_GET['id']);
-                if(WebUsers::isAdmin() && ($_GET['id']!= $_SESSION['id'])){
-                    $result['isAdmin'] = "TRUE";
+                if(($_GET['id'] != $_SESSION['id']) && (!WebUsers::isAdmin()) ){
+                    print('No permission to see this page!');
+                    exit;
+                }else{
+                    $result = WebUsers::getInfo($_GET['id']);
+                    if(WebUsers::isAdmin() && ($_GET['id']!= $_SESSION['id'])){
+                        $result['isAdmin'] = "TRUE";
+                    }
+                    $result['target_id'] = $_GET['id'];
+                    $result['current_mail'] = WebUsers::getEmail($_GET['id']);
                 }
-                $result['target_id'] = $_GET['id'];
-                $result['current_mail'] = WebUsers::getEmail($_GET['id']);
             }else{
                 $result = WebUsers::getInfo($_SESSION['id']);
                 $result['target_id'] = $_SESSION['id'];
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php
new file mode 100644
index 000000000..c065c6985
--- /dev/null
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php
@@ -0,0 +1,20 @@
+<?php
+
+function userlist(){
+    if(WebUsers::isAdmin()){
+        $users = WebUsers::getUsers();
+        $i = 0;
+        $pageResult['userlist'] = Array();
+        while($row = $users->fetch(PDO::FETCH_ASSOC)){
+            $pageResult['userlist'][$i]['id'] = $row['UId'];
+            $pageResult['userlist'][$i]['username'] = $row['Login'];
+            $pageResult['userlist'][$i]['permission'] = $row['Permission'];
+            $pageResult['userlist'][$i]['email'] = $row['Email'];
+            $i++;
+        }
+        return $pageResult;
+    }else{
+        print('no permission');
+        exit;
+    }
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
index b2c79ba00..aaa625a7d 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
@@ -5,6 +5,7 @@
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
 	<li class="nav-header hidden-tablet">Admin</li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=libuserlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Liblist</span></a></li>
+        <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=userlist"><i class="icon-th-list"></i><span class="hidden-tablet"> UserList</span></a></li>
         <li class="nav-header hidden-tablet">Actions</li>
         <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
 
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl
index 891bbd04b..5b4975c91 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/userlist.tpl
@@ -1,22 +1,45 @@
 {block name=content}
-	
-	<div class="row-fluid">
-		<div class="box span12">
-			<div class="box-header well">
-				<h2><i class="icon-info-sign"></i> {$userlist_info}</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-round" onclick="javascript:show_help('intro');return false;"><i class="icon-info-sign"></i></a>
-					<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-					<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">
-				<p><strong>The shard/lib/web db user list</strong> You are about to see it here!</p>
-	
-				<div class="clearfix"></div>
-			</div>
-		</div>
-	</div>
+<div class="row-fluid">		
+				<div class="box span12">
+					<div class="box-header well" data-original-title>
+						<h2><i class="icon-user"></i> Members</h2>
+						<div class="box-icon">
+							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
+							<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">
+						<table class="table table-striped table-bordered bootstrap-datatable datatable">
+						  <thead>
+							  <tr>
+								  <th>Id</th>
+								  <th>Username</th>
+								  <th>Email</th>
+								  <th>Permission</th>
+								  <th>Action</th>
+							  </tr>
+						  </thead>   
+						  <tbody>
+							{foreach from=$userlist item=element}
+							<tr>
+								<td>{$element.id}</td>
+								<td class="center">{$element.username}</td>
+								<td class="center">{$element.email}</td>
+								{if $element.permission eq 1}<td class="center"><span class="label label-success">User</span></td>{/if}
+								{if $element.permission eq 2}<td class="center"><span class="label label-warning">Admin</span></td>{/if}
+								<td class="center">
+									<a class="btn btn-info" href="index.php?page=settings&id={$element.id}"><i class=" icon-pencil icon-white"></i>Edit User</a>
+								</td>
+								
+							</tr>
+							{/foreach}
+					
+						  </tbody>
+					  </table>            
+					</div>
+				</div><!--/span-->
+			
+			</div><!--/row-->
 {/block}