diff --git a/config/alfresco/extension/web-client-config-custom.xml.sample b/config/alfresco/extension/web-client-config-custom.xml.sample
index f2dd53dcab..000c32253c 100644
--- a/config/alfresco/extension/web-client-config-custom.xml.sample
+++ b/config/alfresco/extension/web-client-config-custom.xml.sample
@@ -1,7 +1,63 @@
 <alfresco-config>
 
-   <!-- The config below shows how to incorporate the -->
-   <!-- example model into the web client             -->
+   <!-- Example of overriding the from email address -->
+   <!--
+   <config>
+      <client>
+         <from-email-address>someone@your-domain.com</from-email-address>
+      </client>
+   </config>
+   -->
+
+   <!-- Example of adding languages to the list in the login page -->
+   <!--
+   <config evaluator="string-compare" condition="Languages">
+      <languages>
+         <language locale="fr_FR">French</language>
+         <language locale="de_DE">German</language>
+         <language locale="ja_JP">Japanese</language>
+      </languages>
+   </config>
+   -->
+
+   <!-- Example of configuring advanced search -->
+   <!--
+   <config evaluator="string-compare" condition="Advanced Search">
+      <advanced-search>
+         <content-types>
+         </content-types>
+         <custom-properties>
+            <meta-data aspect="app:simpleworkflow" property="app:approveStep" />
+         </custom-properties>
+      </advanced-search>
+   </config>
+   -->
+
+   <!-- Example of changing the sort direction for a view in the client -->
+   <!--
+   <config evaluator="string-compare" condition="Views">
+      <views>
+         <view-defaults>
+            <topic>
+               <sort-direction>ascending</sort-direction>
+            </topic>
+         </view-defaults>
+      </views>
+   </config>
+   -->
+
+   <!-- Example of adding a custom icon to the Create Space dialog -->
+   <!--
+   <config evaluator="string-compare" condition="cm:folder icons">
+      <icons>
+         <icon name="space-icon-custom" path="/images/icons/space-icon-custom.gif" />
+      </icons>
+   </config>
+   -->
+
+   <!-- The config below shows how to incorporate the example model-->
+   <!-- into the web client, for this to work you will need to -->
+   <!-- rename example-model-context.xml.sample to example-model-context.xml -->
    <!--
    <config evaluator="string-compare" condition="Custom Content Types">
       <content-types>
@@ -36,6 +92,18 @@
          <aspect name="my:imageClassification"/>
       </aspects>
    </config>
+
+   <config evaluator="string-compare" condition="Advanced Search">
+      <advanced-search>
+         <content-types>
+            <type name="my:sop" />
+         </content-types>
+         <custom-properties>
+            <meta-data type="my:sop" property="my:authorisedBy" />
+            <meta-data aspect="my:imageClassification" property="my:resolution" />
+         </custom-properties>
+      </advanced-search>
+   </config>
    -->
 
 </alfresco-config>
diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 54de66ff91..e18bab84de 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -438,6 +438,7 @@ change_password=Change Password
 title_change_password=Change User Password
 change_password_description=Use this view to change an existing user password.
 change_password_instructions=Enter the new password for this user.
+show_all=Show All
 
 # Check-in messages
 check_in=Check In
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index 4c01f79923..98a65fb0e2 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -127,7 +127,6 @@
          <content-types>
             <!-- cm:content type is implicit in this list -->
             <!-- types must extend cm:content for the Alfresco web-client -->
-            <type name="cm:dictionaryModel" />
             <type name="fm:post" />
          </content-types>
          <!-- custom properties to be shown in the More Options panel -->
diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
index ab82d8498f..8dd620de3d 100644
--- a/source/web/jsp/users/users.jsp
+++ b/source/web/jsp/users/users.jsp
@@ -124,8 +124,8 @@
                               
                               <div style="padding: 6px;" />
                               <h:inputText value="#{UsersBean.searchCriteria}" size="35" maxlength="1024" />&nbsp;
-                              <h:commandButton value="Search" action="#{UsersBean.search}" />&nbsp;
-                              <h:commandButton value="Show All" action="#{UsersBean.showAll}" />
+                              <h:commandButton value="#{msg.search}" action="#{UsersBean.search}" />&nbsp;
+                              <h:commandButton value="#{msg.show_all}" action="#{UsersBean.showAll}" />
                               <div style="padding: 6px;" />
                               
                               <a:richList id="users-list" binding="#{UsersBean.usersRichList}" viewMode="details" pageSize="10"