diff --git a/src/addserver.html b/src/addserver.html
index a5c67ddcee..763f56851b 100644
--- a/src/addserver.html
+++ b/src/addserver.html
@@ -1,20 +1,16 @@
 <div data-role="page" class="page standalonePage">
     <div class="padded-left padded-right padded-bottom-page">
-        <form class="manualServerForm" style="margin: 0 auto;">
-            <h1 style="text-align: left;">${HeaderConnectToServer}</h1>
+        <form class="addServerForm" style="margin: 0 auto;">
+            <h1>${HeaderConnectToServer}</h1>
             <div class="inputContainer">
                 <input is="emby-input" type="text" id="txtServerHost" required="required" label="${LabelServerHost}" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off" />
-                <div class="fieldDescription" style="text-align: left;">${LabelServerHostHelp}</div>
-            </div>
-            <br />
-            <div class="inputContainer">
-                <input is="emby-input" type="number" id="txtServerPort" step="1" min="0" value="8096" label="${LabelServerPort}" />
+                <div class="fieldDescription">${LabelServerHostHelp}</div>
             </div>
             <br />
             <button is="emby-button" type="submit" class="raised button-submit block">
                 <span>${ButtonConnect}</span>
             </button>
-            <button is="emby-button" type="button" class="raised button-cancel block btnCancelManualServer">
+            <button is="emby-button" type="button" class="raised button-cancel block btnCancel">
                 <span>${ButtonCancel}</span>
             </button>
         </form>
diff --git a/src/controllers/addserver.js b/src/controllers/addserver.js
index 45fa427420..6d596632b2 100644
--- a/src/controllers/addserver.js
+++ b/src/controllers/addserver.js
@@ -6,7 +6,8 @@ define(["appSettings", "loading", "browser", "emby-button"], function(appSetting
         switch (result.State) {
             case "SignedIn":
                 var apiClient = result.ApiClient;
-                Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient), Dashboard.navigate("home.html");
+                Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
+                Dashboard.navigate("home.html");
                 break;
             case "ServerSignIn":
                 Dashboard.navigate("login.html?serverid=" + result.Servers[0].Id, false, "none");
@@ -27,14 +28,9 @@ define(["appSettings", "loading", "browser", "emby-button"], function(appSetting
         }
     }
 
-    function submitManualServer(page) {
-        var host = page.querySelector("#txtServerHost").value;
-        var port = page.querySelector("#txtServerPort").value;
-        if (port) {
-            host += ":" + port;
-        }
-
+    function submitServer(page) {
         loading.show();
+        var host = page.querySelector("#txtServerHost").value;
         ConnectionManager.connectToAddress(host, {
             enableAutoLogin: appSettings.enableAutoLogin()
         }).then(function(result) {
@@ -47,11 +43,11 @@ define(["appSettings", "loading", "browser", "emby-button"], function(appSetting
     }
 
     return function(view, params) {
-        view.querySelector(".manualServerForm").addEventListener("submit", onManualServerSubmit);
-        view.querySelector(".btnCancelManualServer").addEventListener("click", goBack);
+        view.querySelector(".addServerForm").addEventListener("submit", onServerSubmit);
+        view.querySelector(".btnCancel").addEventListener("click", goBack);
 
-        function onManualServerSubmit(e) {
-            submitManualServer(view);
+        function onServerSubmit(e) {
+            submitServer(view);
             e.preventDefault();
             return false;
         }