diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py
index 42f15032..20692e23 100644
--- a/charmhelpers/contrib/openstack/context.py
+++ b/charmhelpers/contrib/openstack/context.py
@@ -525,6 +525,7 @@ class IdentityServiceContext(OSContextGenerator):
                 if float(api_version) > 2:
                     ctxt.update({
                         'admin_domain_name': _resolve('service_domain'),
+                        'service_user_id': _resolve('service_user_id'),
                         'service_project_id': _resolve('service_tenant_id'),
                         'service_domain_id': _resolve('service_domain_id')})
 
@@ -557,6 +558,7 @@ class IdentityServiceContext(OSContextGenerator):
                     # NOTE(jamespage) this is required for >= icehouse
                     # so a missing value just indicates keystone needs
                     # upgrading
+                    ctxt['admin_user_id'] = _resolve('service_user_id')
                     ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
                     ctxt['admin_domain_id'] = _resolve('service_domain_id')
                     return ctxt
diff --git a/templates/ocata/cinder.conf b/templates/ocata/cinder.conf
index 71fff66b..71a9e9ce 100644
--- a/templates/ocata/cinder.conf
+++ b/templates/ocata/cinder.conf
@@ -51,8 +51,8 @@ os_region_name = {{ region }}
 volume_usage_audit_period = {{ volume_usage_audit_period }}
 
 {% if auth_host -%}
-cinder_internal_tenant_project_id = {{ admin_tenant_name }}
-cinder_internal_tenant_user_id = {{ admin_user }}
+cinder_internal_tenant_project_id = {{ admin_tenant_id }}
+cinder_internal_tenant_user_id = {{ admin_user_id }}
 {% endif -%}
 
 {% include "parts/backends" %}
diff --git a/templates/ussuri/cinder.conf b/templates/ussuri/cinder.conf
index a4456bf2..ff4c0239 100644
--- a/templates/ussuri/cinder.conf
+++ b/templates/ussuri/cinder.conf
@@ -51,8 +51,8 @@ os_region_name = {{ region }}
 volume_usage_audit_period = {{ volume_usage_audit_period }}
 
 {% if auth_host -%}
-cinder_internal_tenant_project_id = {{ admin_tenant_name }}
-cinder_internal_tenant_user_id = {{ admin_user }}
+cinder_internal_tenant_project_id = {{ admin_tenant_id }}
+cinder_internal_tenant_user_id = {{ admin_user_id }}
 {% endif -%}
 
 {% include "parts/backends" %}