diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 549753c5ff..dbcacb9138 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -20,14 +20,6 @@
             $('#userProfileNavigation', page).show();
 
             ApiClient.getUser(userId).done(function (user) {
-	            //I don't really like this hack - Craig
-	            $("div.sidebarLinks a").removeClass("selectedSidebarLink");
-	            $("div.sidebarLinks a").each(function(){
-		           if ($(this).attr("href")=="userprofiles.html") {
-			           $(this).addClass("selectedSidebarLink");
-		           }
-	            });
-
                 Dashboard.setPageTitle(user.Name);
 
                 $('#fldUseDefaultLibrary', page).show();
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ed5de7361a..b3b6793d4f 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -761,7 +761,7 @@ var Dashboard = {
         }, {
             name: "Media Library",
             href: "library.html",
-            selected: pageElem.id == "mediaLibraryPage"
+            selected: pageElem.id == "mediaLibraryPage" && !getParameterByName('userId')
         }, {
             name: "Metadata",
             href: "metadata.html",
@@ -773,7 +773,7 @@ var Dashboard = {
         }, {
             name: "User Profiles",
             href: "userprofiles.html",
-            selected: page.hasClass("userProfilesConfigurationPage")
+            selected: page.hasClass("userProfilesConfigurationPage") || (pageElem.id == "mediaLibraryPage" && getParameterByName('userId'))
         }, {
             name: "Display Settings",
             href: "uisettings.html",