diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index.php b/code/ryzom/tools/server/ryzom_ams/www/html/index.php
index e09d3a0f3..dfd194049 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php
@@ -7,9 +7,16 @@ session_start();
 
 //print_r($_SESSION);
 
+//perform an action in case one is specified
+if ( isset( $_POST["function"] ) ){
+     require( "inc/" . $_POST["function"] . ".php" );
+     $return = $_POST["function"]();
+}
+
 //Decide what page to load
 if(isset($_SESSION['user'])){
      $page = 'home';
+     $return['username'] = $_SESSION['user'];
 }else{
      //default page
      $page = 'login';   
@@ -19,13 +26,6 @@ if ( isset( $_GET["page"] ) ){
      $page = $_GET["page"];
      }
 
-//perform an action in case one is specified
-if ( isset( $_POST["function"] ) ){
-     require( "inc/" . $_POST["function"] . ".php" );
-     $return = $_POST["function"]();
-}
-
-
 function loadpage ( $page ){
      $filename = 'autoload/' . $page . '.php';
      if(is_file($filename)){
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
index 5cbc80a2d..16d032be1 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
@@ -89,17 +89,19 @@
 				</div>
 				<!-- theme selector ends -->
 				<!-- user dropdown starts -->
+				{if isset($username)}
 				<div class="btn-group pull-right">
 					<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-						<i class="icon-user"></i><span class="hidden-phone"> admin</span>
+						<i class="icon-user"></i><span class="hidden-phone">{$username}</span>
 						<span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu">
 						<li><a href="#">Profile</a></li>
 						<li class="divider"></li>
-						<li><a href="login.php">Logout</a></li>
+						<li><a href="index.php?page=logout">Logout</a></li>
 					</ul>
 				</div>
+				{/if}
 				<!-- user dropdown ends -->
 
 
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl
index 29dea8036..a31bfe6c7 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl
@@ -15,12 +15,12 @@
 		<form method="post" action="index.php" class="form-horizontal">
 			<fieldset>
 				<div data-rel="tooltip" class="input-prepend" data-original-title="Username">
-					<span class="add-on"><i class="icon-user"></i></span><input type="text" value="" id="Username" name="Username" class="input-large span10" autofocus="">
+					<span class="add-on"><i class="icon-user"></i></span><input type="text" value="" id="Username" name="Username" class="input-large span10" placeholder="Username">
 				</div>
 				<div class="clearfix"></div>
 
 				<div data-rel="tooltip" class="input-prepend" data-original-title="Password">
-					<span class="add-on"><i class="icon-lock"></i></span><input type="password" value="" id="Password" name="Password" class="input-large span10">
+					<span class="add-on"><i class="icon-lock"></i></span><input type="password" value="" id="Password" name="Password" class="input-large span10" placeholder="Password">
 				</div>
 				<div class="clearfix"></div>