diff --git a/forms/registration/snikket_wait.rb b/forms/registration/snikket_wait.rb
index e7697a7ef764076e48b5965d28a62c37b1fe837f..dc206f12ac8182acc92a57242481bf344c10c903 100644
--- a/forms/registration/snikket_wait.rb
+++ b/forms/registration/snikket_wait.rb
@@ -11,5 +11,7 @@ field(
 	label: "If this takes more than 10 minutes, tap here to contact support",
 	var: "support",
 	type: "jid-single",
-	value: CONFIG[:notify_from]
+	value: CONFIG[:xep0157].find { |x|
+		x[:var] == "support-addresses"
+	}[:value]&.sub(/^xmpp:/, "")
 )
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 02627dc687142e020d5c5232e765f1b7f0590682..75270aae2227ff2473195aa8d2224684f806e907 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -97,6 +97,9 @@ CONFIG = {
 		realm: "sip.example.com",
 		app: "sipappid"
 	},
+	xep0157: [
+		{ var: "support-addresses", value: "xmpp:tel@cheogram.com" }
+	],
 	credit_card_url: ->(*) { "http://creditcard.example.com?" },
 	electrum_notify_url: ->(*) { "http://notify.example.com" },
 	keep_area_codes: ["556"],