diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 067b47d82..646230160 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -399,6 +399,12 @@ namespace MediaBrowser.Api.Playback
         /// <returns>System.String.</returns>
         private string GetConvertedAssPath(Video video, MediaStream subtitleStream, long? startTimeTicks, bool performConversion)
         {
+            // If it's already ass, no conversion neccessary
+            //if (string.Equals(Path.GetExtension(subtitleStream.Path), ".ass", StringComparison.OrdinalIgnoreCase))
+            //{
+            //    return subtitleStream.Path;
+            //}
+
             var offset = TimeSpan.FromTicks(startTimeTicks ?? 0);
 
             var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, offset, ".ass");
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 35e9b3b0f..d88474d61 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -56,6 +56,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool IsDisabled { get; set; }
 
+        public bool DisplayVirtualEpisodes { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -63,6 +65,7 @@ namespace MediaBrowser.Model.Configuration
         {
             IsAdministrator = true;
             BlockNotRated = false;
+            DisplayVirtualEpisodes = true;
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
index ae4d91148..a40dff5a4 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
@@ -120,7 +120,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             var result = await WebSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false);
 
-            if (result.CloseStatus.HasValue && result.CloseStatus.Value != WebSocketCloseStatus.Empty)
+            if (result.CloseStatus.HasValue)
             {
                 _logger.Info("Web socket connection closed by client. Reason: {0}", result.CloseStatus.Value);
                 return null;
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index e9a88e045..2c6b5532b 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -516,6 +516,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "updatepasswordpage.js",
                                       "userimagepage.js",
                                       "userprofilespage.js",
+                                      "usersettings.js",
                                       "wizardfinishpage.js",
                                       "wizardservice.js",
                                       "wizardstartpage.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index c8d43d819..4d12fa770 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -338,6 +338,9 @@
     <Content Include="dashboard-ui\scripts\tvupcoming.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\usersettings.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\wizardservice.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -347,6 +350,9 @@
     <Content Include="dashboard-ui\tvupcoming.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\usersettings.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\wizardservice.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>