diff --git a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml
index dd7c5b7..e38bd76 100644
--- a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml
+++ b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml
@@ -81,22 +81,20 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 <!--  </property>-->
 </bean>
 
-
+<bean id="accessDecisionManager" class="org.acegisecurity.vote.AffirmativeBased">
+	<property name="allowIfAllAbstainDecisions" value="false"/>
+	<property name="decisionVoters">
+		<list>
+			<bean class="org.acegisecurity.vote.RoleVoter"/>
+			<bean class="org.acegisecurity.vote.AuthenticatedVoter"/>
+		</list>
+	</property>
+</bean>
 
 <!-- AUTHORIZATION SERVICES -->
 <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor">
   <property name="authenticationManager" ref="authenticationManager"/>
-  <property name="accessDecisionManager">
-    <bean class="org.acegisecurity.vote.AffirmativeBased">
-      <property name="allowIfAllAbstainDecisions" value="false"/>
-      <property name="decisionVoters">
-        <list>
-          <bean class="org.acegisecurity.vote.RoleVoter"/>
-          <bean class="org.acegisecurity.vote.AuthenticatedVoter"/>
-        </list>
-      </property>
-    </bean>
-  </property>
+  <property name="accessDecisionManager" ref="accessDecisionManager"/>
   <property name="objectDefinitionSource">
     <value>
       CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
@@ -108,6 +106,18 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
   </property>
 </bean>
 
+<bean id="SecurityAnnotationAttributes" class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>
+<bean id="MethodDefinitionAttributes" class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">
+  <property name="attributes"><ref local="SecurityAnnotationAttributes"/></property>
+</bean>
+
+<bean id="methodInvocationInterceptor" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+	<property name="validateConfigAttributes"><value>true</value></property>
+	<property name="authenticationManager" ref="authenticationManager"/>
+	<property name="accessDecisionManager" ref="accessDecisionManager"/>
+	<property name="objectDefinitionSource" ref="MethodDefinitionAttributes"/>
+</bean>
+
 <!-- LOGOUT -->
 <bean id="logoutFilter" class="org.acegisecurity.ui.logout.LogoutFilter">
   <constructor-arg value="/index.jsp"/>
diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 5e3790f..85bce49 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -96,6 +96,7 @@ form.forgotPassword.email=E-Mail address for your account :
 form.forgotPassword.submit=Request new password
 form.forgotPassword.help=Please enter the email address you used for your YACOS account.\nA new password will be generated and sent into your mailbox.
 forgotPassword.title=Reset your password
+forgotPassword.submitted=A new password has been successfully generated for your account.\nIt has been sent to your email address.
 
 ###################
 # MESSAGE ERROR
@@ -178,6 +179,8 @@ conference5.usersList=PC members for this conference
 conference5.invitation.send=Invite a new user
 conference5.invitationList=Invitations to send
 
+conference.error.noTokenLeft=You have no conference creation token left !\nPlease contact the administrator
+
 
 evaluation.title=Evaluation of an article
 evaluation.commentPCMember=Comment of PC Member
diff --git a/YACOSWeb/WebContent/images/button-borders.png b/YACOSWeb/WebContent/images/button-borders.png
new file mode 100644
index 0000000..fb2c35e
Binary files /dev/null and b/YACOSWeb/WebContent/images/button-borders.png differ
diff --git a/YACOSWeb/WebContent/images/button-box-down.png b/YACOSWeb/WebContent/images/button-box-down.png
new file mode 100644
index 0000000..53c24d2
Binary files /dev/null and b/YACOSWeb/WebContent/images/button-box-down.png differ
diff --git a/YACOSWeb/WebContent/images/button-box-hover.png b/YACOSWeb/WebContent/images/button-box-hover.png
new file mode 100644
index 0000000..4e29e51
Binary files /dev/null and b/YACOSWeb/WebContent/images/button-box-hover.png differ
diff --git a/YACOSWeb/WebContent/images/button-box.png b/YACOSWeb/WebContent/images/button-box.png
new file mode 100644
index 0000000..c33270a
Binary files /dev/null and b/YACOSWeb/WebContent/images/button-box.png differ