diff --git a/keystoneauth1/identity/base.py b/keystoneauth1/identity/base.py
index d73ef524..81498acd 100644
--- a/keystoneauth1/identity/base.py
+++ b/keystoneauth1/identity/base.py
@@ -245,6 +245,7 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
             #               For now, just use any information the use has
             #               provided.
             endpoint_data = discover.EndpointData(
+                service_url=endpoint_override,
                 catalog_url=endpoint_override,
                 interface=interface,
                 region_name=region_name,
diff --git a/keystoneauth1/tests/unit/identity/test_identity_common.py b/keystoneauth1/tests/unit/identity/test_identity_common.py
index b208e546..9a7c5fb9 100644
--- a/keystoneauth1/tests/unit/identity/test_identity_common.py
+++ b/keystoneauth1/tests/unit/identity/test_identity_common.py
@@ -1711,6 +1711,8 @@ class CatalogHackTests(utils.TestCase):
                                       max_version=(2, discover.LATEST))
 
         self.assertTrue(common_m.called)
+        self.assertEqual(self.OTHER_URL, data.service_url)
+        self.assertEqual(self.OTHER_URL, data.catalog_url)
         self.assertEqual(self.OTHER_URL, data.url)
         self.assertEqual((2, 1), data.min_microversion)
         self.assertEqual((2, 35), data.max_microversion)