diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index f77e634e96..b749096b94 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -105,7 +105,7 @@ class Enterprise < ApplicationRecord
   after_touch :touch_distributors
   after_create :set_default_contact
   after_create :relate_to_owners_enterprises
-  after_create :send_welcome_email
+  after_create_commit :send_welcome_email
 
   after_rollback :restore_permalink
 
diff --git a/spec/services/sets/model_set_spec.rb b/spec/services/sets/model_set_spec.rb
index d9154c5bf1..97528f5df4 100644
--- a/spec/services/sets/model_set_spec.rb
+++ b/spec/services/sets/model_set_spec.rb
@@ -51,7 +51,7 @@ describe Sets::ModelSet do
       attributes = { collection_attributes: { '1' => { name: 'deleteme' } } }
 
       ms = Sets::ModelSet.new(Enterprise, Enterprise.all, attributes, nil,
-                              proc { |attrs| attrs['name'] == 'deleteme' })
+                              proc { |attrs| attrs[:name] == 'deleteme' })
 
       expect { ms.save }.to change(Enterprise, :count).by(0)
     end