diff --git a/source/openstack_identity.rst b/source/openstack_identity.rst
index f4cea717..865971d2 100644
--- a/source/openstack_identity.rst
+++ b/source/openstack_identity.rst
@@ -189,8 +189,7 @@ environment variables to reduce command length.
      $ export OS_TOKEN=ADMIN_TOKEN
 
   Replace ``ADMIN_TOKEN`` with the authentication token that you
-  generated before.
-  For example:
+  generated before. For example:
 
   .. code-block:: console
 
@@ -444,3 +443,56 @@ Complete the following steps to create projects, users and roles:
      .. code-block:: console
 
         $ openstack role add --project demo --user demo user
+
+Verify operation
+~~~~~~~~~~~~~~~~
+
+Verify operation of the Identity service before installing other
+services.
+
+#. For security reasons, remove the admin_token value in
+   /etc/keystone/keystone.conf:
+
+   Edit the ``[DEFAULT]`` section and remove ``admin_token``.
+
+#. Unset the temporary ``OS_TOKEN`` and ``OS_URL`` environment variables:
+
+  .. code-block:: console
+
+     $ unset OS_TOKEN OS_URL
+
+#. As the ``admin`` user, request an authentication token:
+
+  .. code-block:: console
+
+     $ openstack --os-auth-url http://controller:35357/v3 \
+       --os-project-domain-id default --os-user-domain-id default \
+       --os-project-name admin --os-username admin --os-auth-type password \
+       token issue
+     Password:
+     +------------+----------------------------------+
+     | Field      | Value                            |
+     +------------+----------------------------------+
+     | expires    | 2015-03-24T18:55:01Z             |
+     | id         | ff5ed908984c4a4190f584d826d75fed |
+     | project_id | cf12a15c5ea84b019aec3dc45580896b |
+     | user_id    | 4d411f2291f34941b30eef9bd797505a |
+     +------------+----------------------------------+
+
+#. As the ``demo`` user, request an authentication token:
+
+  .. code-block:: console
+
+     $ openstack --os-auth-url http://controller:5000/v3 \
+       --os-project-domain-id default --os-user-domain-id default \
+       --os-project-name demo --os-username demo --os-auth-type password \
+       token issue
+     Password:
+     +------------+----------------------------------+
+     | Field      | Value                            |
+     +------------+----------------------------------+
+     | expires    | 2014-10-10T12:51:33Z             |
+     | id         | 1b87ceae9e08411ba4a16e4dada04802 |
+     | project_id | 4aa51bb942be4dd0ac0555d7591f80a6 |
+     | user_id    | 7004dfa0dda84d63aef81cf7f100af01 |
+     +------------+----------------------------------+