diff --git a/heat/common/context.py b/heat/common/context.py
index 854c13467e..0813518310 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -257,7 +257,7 @@ class RequestContext(context.RequestContext):
             return generic.Password(username=self.username,
                                     password=self.password,
                                     project_id=self.project_id,
-                                    user_domain_id=self.user_domain,
+                                    user_domain_id=self.user_domain_id,
                                     auth_url=self.keystone_v3_endpoint)
 
         if self.auth_token:
diff --git a/heat/tests/clients/test_heat_client.py b/heat/tests/clients/test_heat_client.py
index 300ad5da92..a72e49cc36 100644
--- a/heat/tests/clients/test_heat_client.py
+++ b/heat/tests/clients/test_heat_client.py
@@ -504,7 +504,7 @@ class KeystoneClientTest(common.HeatTestCase):
         ctx.auth_token = None
         ctx.password = 'password'
         ctx.trust_id = None
-        ctx.user_domain = 'adomain123'
+        ctx.user_domain_id = 'adomain123'
         heat_ks_client = heat_keystoneclient.KeystoneClient(ctx)
         client = heat_ks_client.client
         self.assertIsNotNone(client)