diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 03dd65068c..d8be5d98d5 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -618,7 +618,7 @@ form, .readOnlyContent {
     }
 
 .tblConnections img {
-    height: 60px;
+    height: 54px;
 }
 
 .clientNowPlayingImage {
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 832619a4de..c32df5c88f 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -4,7 +4,7 @@
     <title>Media Library</title>
 </head>
 <body>
-    <div id="librarySettingsPage" data-role="page" class="page type-interior">
+    <div id="librarySettingsPage" data-role="page" class="page type-interior mediaLibraryPage">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index fd0d228e0f..372b283e37 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -112,7 +112,9 @@
             html += '</td>';
 
             html += '<td class="username">';
-            html += connection.UserName || '';
+            if (connection.UserId) {
+                html += '<a href="useredit.html?userid=' + connection.UserId + '">' + connection.UserName + '</a>';
+            }
             html += '</td>';
 
             var nowPlayingItem = connection.NowPlayingItem;
@@ -138,7 +140,11 @@
 
         row.removeClass('deadSession');
 
-        $('.username', row).html(session.UserName || '');
+        if (session.UserId) {
+            $('.username', row).html('<a href="useredit.html?userid=' + session.UserId + '">' + session.UserName + '</a>').trigger('create');
+        } else {
+            $('.username', row).html('');
+        }
 
         var nowPlayingItem = session.NowPlayingItem;
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 888514a3ed..0d338ea22d 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -673,7 +673,7 @@ var Dashboard = {
             name: "Media Library",
             divider: true,
             href: "library.html",
-            selected: pageElem.id == "mediaLibraryPage" && !getParameterByName('userId')
+            selected: page.hasClass("mediaLibraryPage")
         }, {
             name: "Metadata",
             href: "metadata.html",
@@ -1248,6 +1248,8 @@ $(function () {
 
         // Close the connection gracefully when possible
         if (ApiClient.isWebSocketOpen() && !MediaPlayer.isPlaying()) {
+
+            console.log('Sending close web socket command');
             ApiClient.closeWebSocket();
         }
     });
