diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts
index 2d7fe4db7..b7f059fe3 100644
--- a/app/renderer/js/pages/preference/new-server-form.ts
+++ b/app/renderer/js/pages/preference/new-server-form.ts
@@ -56,6 +56,7 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
     "input.setting-input-value",
   )!;
 
+<<<<<<< HEAD
   async function submitFormHandler(): Promise<void> {
     $saveServerButton.textContent = "Connecting...";
     let serverConf;
@@ -73,11 +74,21 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
       });
       return;
     }
-
     await DomainUtil.addDomain(serverConf);
     onChange();
   }
 
+	autoComplete(url: string): string {
+		const pattern = /^[a-zA-Z\d-]*$/;
+		let serverUrl = url.trim();
+
+		if (pattern.test(serverUrl)) {
+			serverUrl = 'https://' + serverUrl + '.zulipchat.com';
+		}
+
+		return serverUrl;
+	}
+
   $saveServerButton.addEventListener("click", async () => {
     await submitFormHandler();
   });