diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 96d90c1..6e90f64 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -80,6 +80,7 @@ end
 # Register Service User
 openstack_user service_user do
   project_name service_project_name
+  domain_name service_domain_name
   password service_pass
   connection_params connection_params
 end
@@ -91,10 +92,3 @@ openstack_user service_user do
   connection_params connection_params
   action :grant_role
 end
-
-openstack_user service_user do
-  domain_name service_domain_name
-  role_name service_role
-  connection_params connection_params
-  action :grant_domain
-end
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index e839d1b..95e2315 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -73,22 +73,13 @@ describe 'openstack-block-storage::identity_registration' do
       expect(chef_run).to create_openstack_user(
         service_user
       ).with(
+        domain_name: domain_name,
         project_name: project_name,
         password: password,
         connection_params: connection_params
       )
     end
 
-    it do
-      expect(chef_run).to grant_domain_openstack_user(
-        service_user
-      ).with(
-        domain_name: domain_name,
-        role_name: role_name,
-        connection_params: connection_params
-      )
-    end
-
     it do
       expect(chef_run).to grant_role_openstack_user(
         service_user