diff --git a/src/docbkx/namespace-config.xml b/src/docbkx/namespace-config.xml
index 45715f6484..c632b6f046 100644
--- a/src/docbkx/namespace-config.xml
+++ b/src/docbkx/namespace-config.xml
@@ -176,14 +176,7 @@
     </user-service>
   </authentication-provider>
   ]]>
-      </programlisting>
-        This defines two users, their passwords and their roles within the application (which will
-        be used for access control). It is also possible to load user information from
-        a standard properties file using the <literal>properties</literal> attribute on 
-        <literal>user-service</literal>. 
-        The <literal>&lt;authentication-provider&gt;</literal>
-        element specifies that the user information will be registered with the authentication
-        manager and used to process authentication requests.        
+        </programlisting>
       </para>
       <sidebar>
         <para>If you are familiar with previous versions of the framework, you can probably
@@ -196,9 +189,18 @@
           bean and the <literal>&lt;user-service&gt;</literal> element creates an 
           <classname>InMemoryDaoImpl</classname>. A <literal>ProviderManager</literal>
           bean is always created by the namespace processing system and the
-          <classname>AuthenticationProvider</classname>
+          <classname>DaoAuthenticationProvider</classname>
           is automatically registered with it.</para>
       </sidebar>
+      <para>
+        The configuration above defines two users, their passwords and their roles within the application (which will
+        be used for access control). It is also possible to load user information from
+        a standard properties file using the <literal>properties</literal> attribute on 
+        <literal>user-service</literal>. See <link xlink:href="#in-memory-service"/> for more details. 
+        Using the <literal>&lt;authentication-provider&gt;</literal>
+        element means that the user information will be used by the authentication
+        manager to process authentication requests.        
+      </para>
       <para>
         At this point you should be able to start up your application and you will be required to
         log in to proceed. Try it out, or try experimenting with the "tutorial" sample application