diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
index 4df81aacca..8124733e52 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs
@@ -233,7 +233,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
             var cmd = connection.CreateCommand();
             cmd.CommandText = "select data from userdata where key = @key and userId=@userId";
 
-            var idParam = cmd.Parameters.Add("@key", DbType.Guid);
+            var idParam = cmd.Parameters.Add("@key", DbType.String);
             idParam.Value = key;
 
             var userIdParam = cmd.Parameters.Add("@userId", DbType.Guid);
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 6f4d675edf..4aaa0e3d49 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -296,13 +296,16 @@
     <Content Include="dashboard-ui\scripts\videojsextensions.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jplayer\jplayer.playlist.min.js">
+    <Content Include="dashboard-ui\thirdparty\video-js\video-js.min.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jplayer\Jplayer.swf">
+    <Content Include="dashboard-ui\thirdparty\video-js\video-js.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jplayer\jquery.jplayer.min.js">
+    <Content Include="dashboard-ui\thirdparty\video-js\video-js.swf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\thirdparty\video-js\video.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\tvgenres.html">