diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 767e3409ff..23cae35da2 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -819,21 +819,22 @@
 
             var imgUrl, text;
 
+            var supporterIconContainer = page.querySelector('.supporterIconContainer');
+
             if (!AppInfo.enableSupporterMembership) {
-                $('.supporterIconContainer', page).remove();
+                supporterIconContainer.classList.add('hide');
             }
             else if (pluginSecurityInfo.IsMBSupporter) {
 
+                supporterIconContainer.classList.remove('hide');
+
                 imgUrl = "css/images/supporter/supporterbadge.png";
                 text = Globalize.translate('MessageThankYouForSupporting');
 
-                $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/premiere" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>');
+                supporterIconContainer.innerHTML = '<a class="imageLink supporterIcon" href="http://emby.media/premiere" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>';
             } else {
 
-                imgUrl = "css/images/supporter/nonsupporterbadge.png";
-                text = Globalize.translate('MessagePleaseSupportProject');
-
-                $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/premiere" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
+                supporterIconContainer.classList.add('hide');
             }
         },
 
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 6f6d16aac8..a8a64fa7f6 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -310,6 +310,13 @@
                 if (!controller) {
                     tabContent = view.querySelector('.pageTabContent[data-index=\'' + index + '\']');
                     controller = index ? new controllerFactory(view, params, tabContent) : self;
+
+                    if (index == 2) {
+                        controller.mode = 'albumartists';
+                    } else if (index == 3) {
+                        controller.mode = 'artists';
+                    }
+
                     tabControllers[index] = controller;
 
                     if (controller.initTab) {
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 7c2053e895..960c18a371 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -235,6 +235,8 @@
 
         $('.editUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        this.querySelector('.sharingHelp').innerHTML = Globalize.translate('OptionAllowLinkSharingHelp', 30);
+
     }).on('pagebeforeshow', "#editUserPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 5797a57594..19ca9833fd 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -316,7 +316,7 @@
   "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices",
   "OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.",
   "OptionAllowLinkSharing": "Allow social media sharing",
-  "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire based on your server sharing settings.",
+  "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire after {0} days.",
   "HeaderSharing": "Sharing",
   "HeaderRemoteControl": "Remote Control",
   "OptionMissingTmdbId": "Missing Tmdb Id",
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index f4a740b7e5..4cf8c177e9 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -88,7 +88,7 @@
                 <div>
                     <br />
                     <paper-checkbox id="chkEnableSharing">${OptionAllowLinkSharing}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionAllowLinkSharingHelp}</div>
+                    <div class="fieldDescription paperCheckboxFieldDescription sharingHelp"></div>
                     <br />
                 </div>
                 <div id="fldIsEnabled" style="margin: 1em 0 2em;">