diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index eb108b08e1..c5c6b46190 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1178,6 +1178,7 @@ start_location=Start Location
 interface_language=Interface Language
 content_language_filter=Content Language Filter
 content_all_languages=All Languages
+user_management=Management
 
 # Delete Space Dialog messages
 select_delete_operation=What do you want to delete?
diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index 5cc8ed411d..d0d836b2ee 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -640,7 +640,8 @@
             <action idref="paste_all" />
             <action idref="manage_space_users" />
             <action idref="manage_space_rules" />
-            <action idref="manage_deleted_items" />
+            <!-- NOTE: now found on the User Console
+            <action idref="manage_deleted_items" />-->
          </action-group>
          
          <!-- Actions Menu for Document Details screen -->
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 2d540804e7..1b87ddab6a 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -156,13 +156,10 @@ public final class AuthenticationHelper
                   
                   // store the User object in the Session - the authentication servlet will then proceed
                   session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);
-               
+                  
                   // Set the current locale
                   I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
                   
-                  // remove the session invalidated flag
-                  session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
-
                   // remove the session invalidated flag
                   session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
                   
@@ -220,10 +217,10 @@ public final class AuthenticationHelper
          // Set the current locale
          I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
          
-         /* setup face context */
+         // setup faces context
          FacesHelper.getFacesContext(httpRequest, httpResponse, context);
          
-         if (loginBean != null && (loginBean.getUserPreferencesBean() != null) )
+         if (loginBean != null && (loginBean.getUserPreferencesBean() != null))
          {
             String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();
             if (contentFilterLanguageStr != null)
diff --git a/source/web/images/logo/AlfrescoLogo32_bluebg.gif b/source/web/images/logo/AlfrescoLogo32_bluebg.gif
new file mode 100644
index 0000000000..f4774eec9c
Binary files /dev/null and b/source/web/images/logo/AlfrescoLogo32_bluebg.gif differ
diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
index afb7196ded..39d6a9ef72 100644
--- a/source/web/jsp/dialog/about.jsp
+++ b/source/web/jsp/dialog/about.jsp
@@ -67,7 +67,7 @@
                      <table cellspacing="4" cellpadding="0" width="100%">
                         <tr>
                            <td width=32>
-                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32.gif" width="32" height="32" />
+                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32_bluebg.gif" width="32" height="32" />
                            </td>
                            <td>
                               <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>
diff --git a/source/web/jsp/users/user-console.jsp b/source/web/jsp/users/user-console.jsp
index 317a4140b0..55910bc70b 100644
--- a/source/web/jsp/users/user-console.jsp
+++ b/source/web/jsp/users/user-console.jsp
@@ -132,13 +132,9 @@
                                  <%-- context for current user is setup on entry to user console --%>
                                  <a:actionLink id="change-password" value="#{msg.change_password}" action="dialog:changePassword" image="/images/icons/change_password.gif" rendered="#{NavigationBean.isGuest == false}" />
                               </a:panel>
+                              
                               <div style="padding:4px"></div>
                               
-                              <%--<h:panelGroup id="pref-panel-facets">
-                                 <f:facet name="title">
-                                    <a:actionLink  value="#{msg.modify}" action="" showLink="false" image="/images/icons/Change_details.gif" rendered="#{NavigationBean.isGuest == false}" />
-                                 </f:facet>
-                              </h:panelGroup>--%>
                               <a:panel label="#{msg.general_pref}" id="pref-panel" rendered="#{NavigationBean.isGuest == false}"
                                        border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
                                  <table cellspacing=2 cellpadding=2 border=0>
@@ -177,6 +173,19 @@
                                     </tr>
                                  </table>
                               </a:panel>
+                              
+                              <div style="padding:4px"></div>
+                              
+                              <a:panel label="#{msg.user_management}" id="man-panel" rendered="#{NavigationBean.isGuest == false}"
+                                       border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
+                                 <table cellspacing=2 cellpadding=2 border=0>
+                                    <tr>
+                                       <td>
+                                          <a:actionLink id="manage-deleted-items" value="#{msg.manage_deleted_items}" action="dialog:manageDeletedItems" image="/images/icons/trashcan.gif" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
                            </td>
                            
                            <td valign="top">