diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js
index d3c6ca0cbe..42b6c929fc 100644
--- a/dashboard-ui/scripts/connectlogin.js
+++ b/dashboard-ui/scripts/connectlogin.js
@@ -53,6 +53,13 @@
                     loadMode(page, 'welcome');
                 }
                 break;
+            case MediaBrowser.ConnectionState.ServerUpdateNeeded:
+                {
+                    Dashboard.alert({
+                        message: Globalize.translate('ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
+                    });
+                }
+                break;
             case MediaBrowser.ConnectionState.Unavailable:
                 {
                     Dashboard.alert({
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index 38d667d500..1a0739b6b1 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -24,6 +24,13 @@
                         Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id);
                     }
                     break;
+                case MediaBrowser.ConnectionState.ServerUpdateNeeded:
+                    {
+                        Dashboard.alert({
+                            message: Globalize.translate('ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
+                        });
+                    }
+                    break;
                 default:
                     showServerConnectionFailure();
                     break;
@@ -34,14 +41,10 @@
 
     function showServerConnectionFailure() {
 
-        // Need the timeout because jquery mobile will not show a popup while another is in process of closing
-        setTimeout(function () {
-            Dashboard.alert({
-                message: Globalize.translate("MessageUnableToConnectToServer"),
-                title: Globalize.translate("HeaderConnectionFailure")
-            });
-
-        }, 300);
+        Dashboard.alert({
+            message: Globalize.translate("MessageUnableToConnectToServer"),
+            title: Globalize.translate("HeaderConnectionFailure")
+        });
     }
 
     function getServerHtml(server) {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c599eef581..98fce9ed95 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1640,7 +1640,7 @@ var AppInfo = {};
                         Dashboard.showLoadingMsg();
 
                         return ConnectionManager.connectToServer(server).then(function (result) {
-                            Dashboard.showLoadingMsg();
+                            Dashboard.hideLoadingMsg();
 
                             if (result.State == MediaBrowser.ConnectionState.SignedIn) {
                                 window.ApiClient = result.ApiClient;
diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js
index fda60cecca..b67a0a80f8 100644
--- a/dashboard-ui/scripts/supporterkeypage.js
+++ b/dashboard-ui/scripts/supporterkeypage.js
@@ -120,4 +120,35 @@
 
 };
 
-$(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow);
\ No newline at end of file
+$(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow);
+
+(function () {
+
+    function loadUserInfo(page) {
+
+        Dashboard.getPluginSecurityInfo().then(function (info) {
+
+            if (info.IsMBSupporter) {
+                $('.supporterContainer', page).addClass('hide');
+            } else {
+                $('.supporterContainer', page).removeClass('hide');
+            }
+        });
+    }
+
+    $(document).on('pageinit', "#supporterKeyPage", function () {
+
+        var page = this;
+        $('#supporterKeyForm').on('submit', SupporterKeyPage.updateSupporterKey);
+        $('#lostKeyForm').on('submit', SupporterKeyPage.retrieveSupporterKey);
+        $('#linkKeysForm').on('submit', SupporterKeyPage.linkSupporterKeys);
+
+        $('.benefits', page).html(Globalize.translate('HeaderSupporterBenefit', '<a href="http://emby.media/premiere" target="_blank">', '</a>'));
+
+    }).on('pageshow', "#supporterKeyPage", function () {
+
+        var page = this;
+        loadUserInfo(page);
+    });
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/strings/javascript/en-US.json b/dashboard-ui/strings/javascript/en-US.json
index 8d654ba384..7ce95a6b9a 100644
--- a/dashboard-ui/strings/javascript/en-US.json
+++ b/dashboard-ui/strings/javascript/en-US.json
@@ -48,6 +48,7 @@
     "ButtonSelectView": "Select view",
     "TitleSync": "Sync",
     "OptionAutomatic": "Auto",
+    "ServerUpdateNeeded": "This Emby Server needs to be updated. To download the latest version, please visit {0}",
     "HeaderSelectDate": "Select Date",
     "ButtonIdentify": "Identify",
     "HeaderIdentifyItem": "Identify Item",
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 976c8c217b..121c4ebbb8 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -49,6 +49,7 @@
     "TitleSync": "Sync",
     "OptionAutomatic": "Auto",
     "HeaderSelectDate": "Select Date",
+    "ServerUpdateNeeded": "This Emby Server needs to be updated. To download the latest version, please visit {0}",
     "ButtonIdentify": "Identify",
     "HeaderIdentifyItem": "Identify Item",
     "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",