diff --git a/doc/admin-guide/source/conf.py b/doc/admin-guide/source/conf.py
index 333bd3e7f7..ccf4fba341 100644
--- a/doc/admin-guide/source/conf.py
+++ b/doc/admin-guide/source/conf.py
@@ -91,7 +91,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['common/log_in_dashboard.rst']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
diff --git a/doc/arch-design-draft/source/conf.py b/doc/arch-design-draft/source/conf.py
index c9612f0189..d2866d5c7f 100644
--- a/doc/arch-design-draft/source/conf.py
+++ b/doc/arch-design-draft/source/conf.py
@@ -90,7 +90,6 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
-                    'common/log_in_dashboard.rst',
                     'common/dashboard_customizing.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/arch-design/source/conf.py b/doc/arch-design/source/conf.py
index 9b8f3abb36..0569bb1ef3 100644
--- a/doc/arch-design/source/conf.py
+++ b/doc/arch-design/source/conf.py
@@ -90,7 +90,6 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
-                    'common/log_in_dashboard.rst',
                     'common/dashboard_customizing.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/cli-reference/source/conf.py b/doc/cli-reference/source/conf.py
index 66874ae66f..791c1d669b 100644
--- a/doc/cli-reference/source/conf.py
+++ b/doc/cli-reference/source/conf.py
@@ -96,7 +96,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli_manage*', 'common/nova*',
-                    'common/get_started_*', 'common/log_in_dashboard.rst',
+                    'common/get_started_*',
                     'common/dashboard_customizing.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/config-reference/source/conf.py b/doc/config-reference/source/conf.py
index b90c73554b..3afacbaa9d 100644
--- a/doc/config-reference/source/conf.py
+++ b/doc/config-reference/source/conf.py
@@ -96,7 +96,6 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
-                    'common/log_in_dashboard.rst',
                     'tables/*.rst', 'tables/manual/*.rst',
                     'tables/conf-changes/ironic.rst']
 
diff --git a/doc/contributor-guide/source/conf.py b/doc/contributor-guide/source/conf.py
index 4ce5199a6c..ce196c6531 100644
--- a/doc/contributor-guide/source/conf.py
+++ b/doc/contributor-guide/source/conf.py
@@ -96,7 +96,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/app_support.rst', 'common/cli*', 'common/nova*',
                     'common/get_started*', 'common/dashboard*',
-                    'common/conventions.rst', 'common/log_in_dashboard.rst']
+                    'common/conventions.rst']
 
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/image-guide/source/conf.py b/doc/image-guide/source/conf.py
index 3620eea8dd..41fb803d22 100644
--- a/doc/image-guide/source/conf.py
+++ b/doc/image-guide/source/conf.py
@@ -90,8 +90,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/get_start*', 'common/cli*', 'common/dashboard*',
-                    'common/nova*',
-                    'common/log_in_dashboard.rst']
+                    'common/nova*']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py
index cb0fd4048d..1dda8d6e30 100644
--- a/doc/install-guide/source/conf.py
+++ b/doc/install-guide/source/conf.py
@@ -92,7 +92,6 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli*', 'common/nova*',
-                    'common/log_in_dashboard.rst',
                     'common/get_started_with_openstack.rst',
                     'common/get_started_openstack_services.rst',
                     'common/get_started_feedback.rst',
diff --git a/doc/networking-guide/source/conf.py b/doc/networking-guide/source/conf.py
index 1c92edcb67..b7e4cbd6fa 100644
--- a/doc/networking-guide/source/conf.py
+++ b/doc/networking-guide/source/conf.py
@@ -90,7 +90,6 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
-                    'common/log_in_dashboard.rst',
                     'common/dashboard_customizing.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/user-guide/source/dashboard.rst b/doc/user-guide/source/dashboard.rst
index 0211ae92ad..d789850400 100644
--- a/doc/user-guide/source/dashboard.rst
+++ b/doc/user-guide/source/dashboard.rst
@@ -11,7 +11,7 @@ sizes of server instances.
 .. toctree::
    :maxdepth: 2
 
-   common/log_in_dashboard.rst
+   dashboard_log_in.rst
    dashboard_manage_images.rst
    configure_access_and_security_for_instances.rst
    dashboard_launch_instances.rst
diff --git a/doc/common/log_in_dashboard.rst b/doc/user-guide/source/dashboard_log_in.rst
similarity index 100%
rename from doc/common/log_in_dashboard.rst
rename to doc/user-guide/source/dashboard_log_in.rst
diff --git a/doc/common/figures/dashboard_admin_tab.png b/doc/user-guide/source/figures/dashboard_admin_tab.png
similarity index 100%
rename from doc/common/figures/dashboard_admin_tab.png
rename to doc/user-guide/source/figures/dashboard_admin_tab.png
diff --git a/doc/common/figures/dashboard_identity_tab.png b/doc/user-guide/source/figures/dashboard_identity_tab.png
similarity index 100%
rename from doc/common/figures/dashboard_identity_tab.png
rename to doc/user-guide/source/figures/dashboard_identity_tab.png
diff --git a/doc/common/figures/dashboard_project_tab.png b/doc/user-guide/source/figures/dashboard_project_tab.png
similarity index 100%
rename from doc/common/figures/dashboard_project_tab.png
rename to doc/user-guide/source/figures/dashboard_project_tab.png
diff --git a/doc/common/figures/dashboard_settings_tab.png b/doc/user-guide/source/figures/dashboard_settings_tab.png
similarity index 100%
rename from doc/common/figures/dashboard_settings_tab.png
rename to doc/user-guide/source/figures/dashboard_settings_tab.png