diff --git a/src/components/quickconnectsettings/quickconnectsettings.js b/src/components/quickconnectsettings/quickconnectsettings.js
index fc167802d8..c65782cafe 100644
--- a/src/components/quickconnectsettings/quickconnectsettings.js
+++ b/src/components/quickconnectsettings/quickconnectsettings.js
@@ -61,7 +61,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
             }
 
             Dashboard.alert({
-                message: "Already active"
+                message: "Successfully activated"
             });
 
             return true;
diff --git a/src/controllers/quickconnect.js b/src/controllers/quickconnect.js
index a6ebc381ce..35e5516f45 100644
--- a/src/controllers/quickconnect.js
+++ b/src/controllers/quickconnect.js
@@ -2,7 +2,7 @@ define(["jQuery", "loading", "fnchecked"], function ($, loading) {
     "use strict";
 
     var page;
-    function loadPage(page, status) {
+    function loadPage(status) {
         var active = (status == "Active");
         var available = (status == "Available") || active;
 
@@ -49,7 +49,7 @@ define(["jQuery", "loading", "fnchecked"], function ($, loading) {
     function updatePage() {
         var promise1 = ApiClient.getQuickConnect("Status");
         Promise.all([promise1]).then((responses) => {
-            loadPage(page, responses[0]);
+            loadPage(responses[0]);
             return true;
         }).catch((e) => {
             console.error("Unable to get quick connect status. error:", e);
diff --git a/src/controllers/user/quickconnect.js b/src/controllers/user/quickconnect.js
index fae5d49865..2b03dec415 100644
--- a/src/controllers/user/quickconnect.js
+++ b/src/controllers/user/quickconnect.js
@@ -23,9 +23,7 @@ define(["quickConnectSettings", "dom", "globalize", "loading", "userSettings", "
                     btn.textContent = "Quick connect is not available on this server";
                     btn.disabled = true;
                     return false;
-                }
-
-                else if (status === "Available") {
+                } else if (status === "Available") {
                     return false;
                 }
 
diff --git a/src/libraries/apiclient/apiclientcore.js b/src/libraries/apiclient/apiclientcore.js
index 04421b8372..e1892505fc 100644
--- a/src/libraries/apiclient/apiclientcore.js
+++ b/src/libraries/apiclient/apiclientcore.js
@@ -358,8 +358,8 @@ define(["events", "appStorage"], function(events, appStorage) {
         })
     }, ApiClient.prototype.quickConnect = function (token) {
         if (!token) return Promise.reject();
-        var url = this.getUrl("Users/AuthenticateWithQuickConnect"),
-            instance = this;
+        var url = this.getUrl("Users/AuthenticateWithQuickConnect");
+        var instance = this;
         return new Promise(function(resolve, reject) {
             var postData = {
                 Token: token
@@ -372,7 +372,8 @@ define(["events", "appStorage"], function(events, appStorage) {
                 contentType: "application/json"
             }).then(function(result) {
                 var afterOnAuthenticated = function() {
-                    redetectBitrate(instance), resolve(result)
+                    redetectBitrate(instance);
+                    return resolve(result);
                 };
                 instance.onAuthenticated ? instance.onAuthenticated(instance, result).then(afterOnAuthenticated) : afterOnAuthenticated()
             }, reject)