diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 83787632ff..464fa41cdb 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -20,8 +20,7 @@
                         <label for="chkUseDefaultLibrary">Use default media library</label>
                     </p>
                     <div id="divMediaLibrary">
-                        <p>Below are your media collections. Expand a collection to add or remove media locations assigned to it.</p>
-	                    <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
+                        <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
                         <p>
                             <button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
                         </p>
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index dbcacb9138..758fe67ee4 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -29,6 +29,7 @@
                 if (user.Configuration.UseCustomLibrary) {
 
                     ApiClient.getVirtualFolders(userId).done(MediaLibraryPage.reloadVirtualFolders);
+	                $(".editing_default").hide();
                     $('#divMediaLibrary', page).show();
                 } else {
                     $('#divMediaLibrary', page).hide();
@@ -118,6 +119,8 @@
             user.Configuration.UseCustomLibrary = !useDefaultLibrary;
 
             ApiClient.updateUser(user).done(MediaLibraryPage.reloadLibrary);
+
+	        $(".editing_default").hide();
         });
     },
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 6910df9b4d..4394e76bae 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -145,16 +145,18 @@
             audioCodec: 'Vorbis'
         }));
 
+	    /* ffmpeg always says the ogg stream is corrupt after conversion
         var oggUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.oga', $.extend({}, baseParams, {
             audioCodec: 'Vorbis'
         }));
+        */
 
         var html = '';
         html += '<audio class="itemAudio" preload="none" controls autoplay>';
         html += '<source type="audio/mpeg" src="' + mp3Url + '" />';
         html += '<source type="audio/aac" src="' + aacUrl + '" />';
         html += '<source type="audio/webm" src="' + webmUrl + '" />';
-        html += '<source type="audio/ogg" src="' + oggUrl + '" />';
+        //html += '<source type="audio/ogg" src="' + oggUrl + '" />';
         html += '</audio';
 
         var nowPlayingBar = $('#nowPlayingBar').show();
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index a6cc8a7fcf..3c8ef32791 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -17,7 +17,7 @@
                     <label for="chkUseDefaultLibrary">Use default media library</label>
                 </p>
                 <div id="divMediaLibrary">
-                    <p>Below are your media collections. Expand a collection to add or remove media locations assigned to it.</p>
+	                <p class="editing_default">This is the <strong>default media library</strong> that will be shared with all users unless they setup their own.</p>
                     <p>
                         <button type="button" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
                     </p>