diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index aa3ec707e3..ffbf054829 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -34,6 +34,7 @@
  - [Ryan Hartzell](https://github.com/ryan-hartzell)
  - [Thibault Nocchi](https://github.com/ThibaultNocchi)
  - [MrTimscampi](https://github.com/MrTimscampi)
+ - [ConfusedPolarBear](https://github.com/ConfusedPolarBear)
 
 # Emby Contributors
 
diff --git a/src/components/quickconnectsettings/quickconnectsettings.js b/src/components/quickconnectsettings/quickconnectsettings.js
index a30db441e6..ed7985dcfa 100644
--- a/src/components/quickconnectsettings/quickconnectsettings.js
+++ b/src/components/quickconnectsettings/quickconnectsettings.js
@@ -15,12 +15,14 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
     }
     
     function list(apiClient) {
-        var elem = $("#quickConnectIncoming");
-        elem.html("");
+        console.debug("getting json");
         apiClient.getJSON("/QuickConnect/List").then(json => {
-            console.debug("raw json", json);
+            var elem = $("#quickConnectIncoming");
+            elem.html("");
+            console.debug("raw json", json, "length is", json.length);
             for(var i = 0; i < json.length; i++) {
                 var current = json[i];
+                console.debug("current is", current);
                 var html = "<li>" + current.Code + " - " + current.FriendlyName + " - ";
                 
                 if(!current.Authenticated) {
diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js
index f5dc9b487b..845ae9a38f 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/auth/login.js
@@ -153,10 +153,10 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
         function loginQuickConnect() {
             var apiClient = getApiClient();
             var friendlyName = "test";
-			
-			var url = apiClient.getUrl("/QuickConnect/Initiate?FriendlyName=" + friendlyName);
-			apiClient.getJSON(url)
-			.then(json => {
+            
+            var url = apiClient.getUrl("/QuickConnect/Initiate?FriendlyName=" + friendlyName);
+            apiClient.getJSON(url)
+            .then(json => {
                 if (!json.Secret || !json.Code) {
                     Dashboard.alert({
                         message: json.Error,
@@ -173,9 +173,9 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
                 loading.show();
 
                 var interval = setInterval(() => {
-					var url = apiClient.getUrl('/QuickConnect/Connect?Secret=' + json.Secret);
+                    var url = apiClient.getUrl('/QuickConnect/Connect?Secret=' + json.Secret);
                     apiClient.getJSON(url)
-					.then(data => {
+                    .then(data => {
                         if(data.Authenticated) {
                             apiClient.quickConnect(data.Authentication).then((result) => {
                                 var user = result.User;
diff --git a/src/controllers/quickconnect.js b/src/controllers/quickconnect.js
index e3d1f76054..5c3c8f9a18 100644
--- a/src/controllers/quickconnect.js
+++ b/src/controllers/quickconnect.js
@@ -2,13 +2,15 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function ($, loading,
     "use strict";
 
     function loadPage(page, status) {
+        console.debug("status is \"" + status + "\"");
+
         var active = (status == "Active");
         var available = (status == "Available") || active;
-        
-        $("#quickConnectStatus").text(status.toLocaleLowerCase());
-        $("#chkQuickConnectAvailable").checked(available);
-        $("#chkQuickConnectActive").checked(active);
-        
+
+        page.querySelector("#quickConnectStatus").textContent = status.toLocaleLowerCase();
+        page.querySelector("#chkQuickConnectAvailable").checked = available;
+        page.querySelector("#chkQuickConnectActive").checked = active;
+
         loading.hide();
     }
 
@@ -44,8 +46,8 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function ($, loading,
     }
 
     $(document).on("pageinit", "#quickConnectPage", function () {
-        $("#quickConnectPage").off("submit", onSubmit).on("submit", onSubmit);
-        $("#btnQuickConnectSubmit").click(onSubmit);
+        document.querySelector("#quickConnectPage").onsubmit = onSubmit;
+        document.querySelector("#btnQuickConnectSubmit").onclick = onSubmit;
     }).on("pageshow", "#quickConnectPage", function () {
         loading.show();
         var page = this;
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
index ff8db72681..f5d05c5be3 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu.js
@@ -24,7 +24,7 @@ define(["apphost", "connectionManager", "layoutManager", "listViewStyle", "emby-
             page.querySelector(".lnkHomePreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId);
             page.querySelector(".lnkPlaybackPreferences").setAttribute("href", "mypreferencesplayback.html?userId=" + userId);
             page.querySelector(".lnkSubtitlePreferences").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
-			page.querySelector(".lnkQuickConnectPreferences").setAttribute("href", "mypreferencesquickconnect.html?userId=" + userId);
+            page.querySelector(".lnkQuickConnectPreferences").setAttribute("href", "mypreferencesquickconnect.html?userId=" + userId);
 
             if (window.NativeShell && window.NativeShell.AppHost.supports("clientsettings")) {
                 page.querySelector(".clientSettings").classList.remove("hide");
diff --git a/src/controllers/user/quickconnect.js b/src/controllers/user/quickconnect.js
index d6f2ae25c1..6e63bcdc08 100644
--- a/src/controllers/user/quickconnect.js
+++ b/src/controllers/user/quickconnect.js
@@ -2,6 +2,13 @@ define(["quickConnectSettings", "dom", "globalize", "loading", "userSettings", "
     "use strict";
 
     return function (view, params) {
+        function notImplemented() {
+            Dashboard.alert({
+                message: "This button is not implemented yet, you must check the checkbox labeled \"Always accept quick connect login requests\" in the dashboard",
+                title: "Not implemented"
+            });
+        }
+        
         var quickConnectSettingsInstance = null;
         var hasChanges;
         var userId = params.userId || ApiClient.getCurrentUserId();
@@ -9,6 +16,8 @@ define(["quickConnectSettings", "dom", "globalize", "loading", "userSettings", "
         view.addEventListener("viewshow", function () {
             console.debug("defining instance");
             
+            $("#btnQuickConnectActivate").click(notImplemented);
+            
             quickConnectSettingsInstance = new QuickConnectSettings({
                 serverId: ApiClient.serverId(),
                 userId: userId,
diff --git a/src/mypreferencesquickconnect.html b/src/mypreferencesquickconnect.html
index 326ce51b48..b9ffdfaccd 100644
--- a/src/mypreferencesquickconnect.html
+++ b/src/mypreferencesquickconnect.html
@@ -1,12 +1,12 @@
 <div id="quickConnectPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHome}" data-backbutton="true">
-    <button is="emby-button" id="btnQuickConnectActivate" type="button" class="raised button-submit block" disabled>
+    <button is="emby-button" id="btnQuickConnectActivate" type="button" class="raised button-submit block">
         <span>Activate</span>
     </button>
     
     Incoming login requests:
     <div class="quickConnectSettingsContainer padded-left padded-right padded-bottom-page">
         <ul id="quickConnectIncoming">
-			<li>Failed to load incoming requests</li>
-		</ul>
+            <li>Failed to load incoming requests</li>
+        </ul>
     </div>
 </div>
diff --git a/src/quickconnect.html b/src/quickconnect.html
index 770796a10e..875716285c 100644
--- a/src/quickconnect.html
+++ b/src/quickconnect.html
@@ -16,7 +16,7 @@
                 </label>
                 <label>
                     <input type="checkbox" is="emby-checkbox" id="chkQuickConnectActive" />
-                    <span>Always accept quick connect login requests</span>
+                    <span>Make quick connect always active (always accept login requests)</span>
                 </label>
                 <div class="fieldDescription checkboxFieldDescription">If unchecked, users will have to click the Activate button in their profile before initiating a quick connect login.</div>
             </div>