Merge branch 'v3.0-beta3'

1 files changed, 3 insertions, 2 deletions

diff --git a/scripts/setup.js b/scripts/setup.js

index 2fb2dd0..0fae913 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -105,7 +105,8 @@ async function validateHomeserverOrigin(serverUrlPrompt, url) {
 		const serverNameResponse = await prompt({
 			type: "input",
 			name: "server_name",
-			message: "Homeserver name"
+			message: "Homeserver name",
+			validate: serverName => !!serverName.match(/[a-z][a-z.]+[a-z]/)
 		})
 
 		console.log("What is the URL of your homeserver?")
@@ -176,7 +177,7 @@ async function validateHomeserverOrigin(serverUrlPrompt, url) {
 			message: "Client secret"
 		})
 
-		const template = getTemplateRegistration()
+		const template = getTemplateRegistration(serverNameResponse.server_name)
 		reg = {
 			...template,
 			url: bridgeOriginResponse.bridge_origin,