diff --git a/sgx_jmp.rb b/sgx_jmp.rb
index fd5813239b06342ee89d1c446038da9877c4dfde..d1bc3eeedec3bd8246ec53bb1dae0475482eaa09 100644
--- a/sgx_jmp.rb
+++ b/sgx_jmp.rb
@@ -926,7 +926,9 @@ Command.new(
 			StatsD.increment("changejid.completed")
 			jid = ProxiedJID.new(customer.jid).unproxied
 			if jid.domain == CONFIG[:onboarding_domain]
-				WelcomeMessage.new(customer, customer.registered?.phone).welcome
+				CustomerRepo.new.find(customer.customer_id).then do |cust|
+					WelcomeMessage.new(cust, customer.registered?.phone).welcome
+				end
 			end
 			Command.finish { |reply|
 				reply.note_type = :info