diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index cecd41b..0284195 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -5,6 +5,12 @@ title=Yacos
 disclaimer.text=Copyrights © 2008. Yacos Team. All rights reserved.
 disclaimer.link.about=About
 
+###################
+# LOGIN FORM
+login.btn.submit=Submit
+login.btn.logout=Logout
+login.field.login=Login
+
 ###################
 # REGISTRATION USER
 register.title=User Registration
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
index d479402..1a95304 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
@@ -23,7 +23,17 @@
 		
 		<!-- User Information -->
 		<div id="userlogin">
-			<page:applyDecorator name="empty" page="/WEB-INF/jsp/login.jsp" />
+			
+			<!-- For anonymous user display the login form -->
+			<authz:authorize ifAllGranted="ROLE_ANONYMOUS">
+				<page:applyDecorator name="empty" page="/WEB-INF/jsp/login.jsp" />
+			</authz:authorize>
+
+			<!-- For authenticated user display user information-->
+			<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
+				<page:applyDecorator name="empty" page="/WEB-INF/jsp/secure/userinformation.jsp" />
+			</authz:authorize>
+			
 		</div>
 		
 		<!-- headermenu -->
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
index 28e468d..acdd52a 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
@@ -1,46 +1,16 @@
 <%@ include file="/WEB-INF/decorators/include.jsp"%>
-<%@ page import="org.acegisecurity.context.SecurityContextHolder" %>
 
 
 <html>
 <head></head>
 <body>
 
-
-<form action="<c:url value='j_acegi_security_check'/>" method="POST">
-
-  <table>
-    <tr>
-      <td>User:</td>
-       <td><input type='text' name='j_username' />
-      </td>
-    </tr>
-    <tr>
-      <td>Password:</td>
-      <td><input type='password' name='j_password' /></td>
-    </tr>
-    <tr>
-      <td><input type="checkbox" name="_acegi_security_remember_me" /></td>
-      <td>Se souvenir de moi</td>
-    </tr>
-    <tr>
-    	<td><input name="submit" type="submit" /></td>
-    	<td><input name="reset" type="reset" /></td>
-    </tr>
-
-  </table>
-</form>
-
-<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
-	<a href="j_acegi_logout">Logout</a>
-</authz:authorize>
-
-
-<authz:authorize ifAllGranted="ROLE_AUTHOR"> 
- <h1>Welcome: <%= SecurityContextHolder.getContext().getAuthentication().getName() %></h1> 
- </authz:authorize>
-
-
+	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
+		<a href="#" id="connexion">Connexion :</a>
+		<input type='text' name='j_username' value="<fmt:message key='login.field.login' />" onfocus="if (this.value == 'Login') { this.value = ''; }" onblur="if (this.value == '') { this.value = 'Login'; }" />
+		<input type='password' name='j_password' />
+		<a href="javascript:document.getElementById('formlogin').submit();" id="submit_btn"><fmt:message key="login.btn.submit" /></a>
+	</form>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
new file mode 100644
index 0000000..cf18096
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
@@ -0,0 +1,15 @@
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+
+<html>
+<head></head>
+<body>
+
+	Firstname Lastname <b>(<authz:authentication operation="username"></authz:authentication>)</b><br />
+	You currently follow <b>4</b> conferences<br />
+	You have the following rights : <b>Author, Chairman, PC Member</b><br />
+	<a href="#">Change my profile</a><br />
+	<a href="j_acegi_logout" id="submit_btn"><fmt:message key="login.btn.logout" /></a>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index b9bca58..53fae8d 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -21,12 +21,56 @@ body {
 	position: relative;
 }
 
+/* @group Login */
+
 #userlogin{
-	background-color: #28fffd;
 	margin-left: 500px;
+	text-decoration: none;
 	height: 100px;
+	position: relative;
+	font-size: smaller;
+	color: #8d0000;
 }
 
+#userlogin #connexion{
+	color: #8d0000;
+	text-decoration: none;
+}
+#userlogin #connexion:hover{
+	color: #ea984b;
+}
+
+#userlogin form{
+	bottom: 0;
+	position: absolute;
+	right: 0;
+}
+#userlogin form input{
+	background-color: #fff8f9;
+	border: 1px solid #ea984b;
+	width: 90px;
+	color: #e59448;
+	height: 14px;
+}
+
+#submit_btn {
+	background-color: #fff8f9;
+	border: 1px solid #ea984b;
+	color: #e59448;
+	height: 14px;
+	text-decoration: none;
+	padding-right: 2px;
+	padding-left: 2px;
+	padding-top: 1px;
+}
+
+#submit_btn:hover {
+	background-color: #fea551;
+	color: #fff;
+}
+
+/* @end */
+
 /* @group header */
 
 #header {
@@ -43,11 +87,11 @@ body {
 }
 
 #logotexte img{
-	float: left;
 	width: 304px;
 	height: 78px;
 	margin-left: 170px;
 	margin-top: 10px;
+	float: left;
 }
 
 #header #bar{
@@ -142,8 +186,8 @@ body {
 	margin: 18px auto;
 	position: relative;
 	color: #b8b8b8;
-	font-size: 10px;
 	text-align: center;
+	font-size: 10px;
 }
 
 #globalfooter a{
