diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index a5a809a..9a51c91 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -9,7 +9,7 @@ disclaimer.link.about=About
 
 ###################
 # LOGIN FORM
-login.title=Login and/or create a new user
+login.title=Create an user or log in
 login.btn.connexion=Connexion
 login.btn.logout=Logout
 login.field.login=Login
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
index 94bc514..251f0ac 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
@@ -6,38 +6,73 @@
 <h4 class="title"><fmt:message key="login.title" /></h4>
 
 	<c:if test="${not empty param.login_error}">
-		<div class="login_error">
+		<p class="errorBox">
 			<fmt:message key="login.message.error" /><br /><br />
-		</div>
-	</c:if><br />
-	
-	<br /> 
+		</p>
+	</c:if>
+
 	
 	<table width="100%">
-	<tr><td width="50%">
-		<div class="cbb">
-		<h2><fmt:message key="login.label.createnewuser" /></h2>
-		<fmt:message key="login.label.createaccount" /><br />
-		<a href="registerUser.htm"><fmt:message key="login.label.register" /></a>
-		</div>
-	</td><td>
-	<div class="cbb">
-		<h2><fmt:message key="login.label.alreadyaccount" /> :</h2>
-	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="mainformlogin">
-		<fmt:message key="login.label.login" /> : <input id="username" type='text' name='j_username' /><br />
-		<fmt:message key="login.label.password" /> : <input id="password" type='password' name='j_password' /><br />
-		<input type="checkbox" name="_acegi_security_remember_me"/>&nbsp;&nbsp;<fmt:message key='login.label.rememberme' /><br />
+	<tr>
+		<td class="newuser"><div class="titleLogin"><fmt:message key="login.label.createnewuser" /></div></td>
+		<td class="existingaccount"><div class="titleLogin"><fmt:message key="login.label.alreadyaccount" /></div></td>
+	</tr>
+	
+	
+	<tr>
+	<td valign="top" width="50%">
 
-		<br /><br />
-		<a href="javascript:document.getElementById('mainformlogin').submit();" id="submit_btn"><fmt:message key="login.btn.connexion" /></a>
-		<script type="text/javascript">	new LoginManager('username', 'password');</script>
-	</form>
-	<div class="yacos_button">
-		<a href="<c:url value="/forgotPassword.htm"/>">
+		<p class="content_login">
+		<fmt:message key="login.label.createaccount" />
+		</p>
+		<center><a class="register_link" href="registerUser.htm">
+			<fmt:message key="login.label.register" />
+		</a></center>
+	</td>
+	
+	<td>
+	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
+	<table  class="content_table">
+	<tr>
+	<td width="100" align="left">
+		<fmt:message key="login.label.login" />
+	</td>
+	<td align="left" width="200">
+		<input id="username" type='text' name='j_username' />
+	</td>
+	</tr>
+	<tr>
+	<td align="left">
+		<fmt:message key="login.label.password" />
+	</td>
+	<td align="left">
+		<input id="password" type='password' name='j_password' />
+	</td>
+	</tr>
+	<tr>
+	<td align="left">
+		<fmt:message key='login.label.rememberme' />
+	</td>
+	<td align="left">
+		<input type="checkbox" name="_acegi_security_remember_me"/>&nbsp;&nbsp;
+	</td>
+	</tr>
+	<tr>
+	<td colspan="2" align="right">
+		<a href="<c:url value="/forgotPassword.htm"/>" class="forgot_pwd">
 		<fmt:message key="login.label.forgotPasswordHeading"/>
 		</a>
-	</div>
-	</div>
+	</td>
+	</tr>
+	</table>
+	</form>
+	
+	<br />
+	<center><a class="submit_link" href="javascript:document.getElementById('formlogin').submit();">
+			<fmt:message key="login.btn.connexion" />
+	</a></center>
+	<script type="text/javascript">	new LoginManager('username', 'password');</script>
+
 	</td></tr>
 	</table>
 	
diff --git a/YACOSWeb/WebContent/images/button_follow_32x32.png b/YACOSWeb/WebContent/images/button_follow_32x32.png
new file mode 100644
index 0000000..ddd27fb
Binary files /dev/null and b/YACOSWeb/WebContent/images/button_follow_32x32.png differ
diff --git a/YACOSWeb/WebContent/images/user_card_add.png b/YACOSWeb/WebContent/images/user_card_add.png
new file mode 100644
index 0000000..fd26565
Binary files /dev/null and b/YACOSWeb/WebContent/images/user_card_add.png differ
diff --git a/YACOSWeb/WebContent/images/user_card_locked.png b/YACOSWeb/WebContent/images/user_card_locked.png
new file mode 100644
index 0000000..bc7de22
Binary files /dev/null and b/YACOSWeb/WebContent/images/user_card_locked.png differ
diff --git a/YACOSWeb/WebContent/images/user_new.png b/YACOSWeb/WebContent/images/user_new.png
new file mode 100644
index 0000000..4fc758c
Binary files /dev/null and b/YACOSWeb/WebContent/images/user_new.png differ
diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index cb9b4e6..1efdab5 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -202,10 +202,79 @@ textarea {
 	color: #333;
 }
 
+
+/* @group Account Login */
+.newuser {
+	background: url(../images/user_card_add.png) no-repeat left top;
+	height: 48px;
+}
+
+.existingaccount {
+	background: url(../images/user_card_locked.png) no-repeat left top;
+	height: 48px;
+}
+
+div .titleLogin{
+	color: #847d6e;
+	margin-left: 60px;
+	margin-top: 10px;
+	font-weight: bold;
+}
+
+p.content_login {
+	color: #847d7d;
+	margin-bottom: 15px;
+}
+	
+a.register_link {
+	text-decoration: none;
+	padding-right: 50px;
+	background: url(../images/button_follow_32x32.png) no-repeat right top;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	color: #008281;
+	font-weight: bold;
+}
+
+a.register_link:hover {
+	color: #003e82;
+}
+
+a.submit_link{
+	text-decoration: none;
+	padding-right: 50px;
+	background: url(../images/button_follow_32x32.png) no-repeat right top;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	color: #008281;
+	font-weight: bold;
+	}
+	
+a.submit_link:hover{
+	color: #003e82;
+	}
+	
+a.forgot_pwd {
+	text-decoration: none;
+	font-size: smaller;
+	color: #008281;
+}
+
+a.forgot_pwd:hover {
+	color: #003e82;
+}
+	
+table.content_table {
+	color: #847d7d;
+	margin-left: 10px;
+	width: 300px;
+}
+
+/* @end */
+
 /* @group mainmenu */
 
 #main #mainmenu {
-
 	width: 150px;
 	float: left;
 }
@@ -274,7 +343,7 @@ textarea {
 
 #maincontent > * {
 	margin-top: 10px;
-	margin-right: 10px;
+	margin-right: 20px;
 }
 
 #main #maincontent h4.title {