diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
index 0cd369a62f..7c404f96f3 100644
--- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py
@@ -118,8 +118,7 @@ def _get_endpoint_url(request, endpoint_type, catalog=None):
 
     # TODO(gabriel): When the Service Catalog no longer contains API versions
     # in the endpoints this can be removed.
-    url = url.rstrip('/')
-    url = urlparse.urljoin(url, 'v%s' % VERSIONS.active)
+    url = auth_utils.fix_auth_url_version(url)
 
     return url
 
diff --git a/releasenotes/notes/bug-1585682-abd815f290e494d3.yaml b/releasenotes/notes/bug-1585682-abd815f290e494d3.yaml
new file mode 100644
index 0000000000..0a424e437b
--- /dev/null
+++ b/releasenotes/notes/bug-1585682-abd815f290e494d3.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - It is no longer necessary to include the version suffix into
+    OPENSTACK_KEYSTONE_URL setting. Thanks to a recent update of
+    django-openstack-auth library as of 2.3.0 release, Horizon will
+    append the proper version suffix to the URL based on the value
+    stored inside OPENSTACK_API_VERSIONS['identity'] setting.
+fixes:
+  - LP-1585682 is fixed which grants Horizon the ability to properly version
+    Keystone webpath endpoints (URLs like http://<hostip>/identity instead of
+    http://<hostip>:5000).
diff --git a/requirements.txt b/requirements.txt
index 1c255359c7..d8f7025959 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ Django<1.9,>=1.8 # BSD
 Pint>=0.5 # BSD
 django-babel>=0.5.1 # BSD
 django-compressor>=2.0 # MIT
-django-openstack-auth>=2.2.0 # Apache-2.0
+django-openstack-auth>=2.3.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
 iso8601>=0.1.11 # MIT
 netaddr!=0.7.16,>=0.7.12 # BSD