3 files changed, 14 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 8535f85c2..e462ac9e2 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1205,7 +1205,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        public virtual Task SetPlayedStatus(User user, bool wasPlayed)
+        public virtual Task SetPlayedStatus(User user, bool wasPlayed, IUserManager userManager)
         {
             if (user == null)
             {
@@ -1235,7 +1235,7 @@ namespace MediaBrowser.Controller.Entities
 
             data.Played = wasPlayed;
 
-            return Kernel.Instance.UserDataManager.SaveUserDataForItem(user, this, data);
+            return userManager.SaveUserDataForItem(user, this, data);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index b2be96b71..28075b9a1 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -962,12 +962,12 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="user">The user.</param>
         /// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
         /// <returns>Task.</returns>
-        public override async Task SetPlayedStatus(User user, bool wasPlayed)
+        public override async Task SetPlayedStatus(User user, bool wasPlayed, IUserManager userManager)
         {
-            await base.SetPlayedStatus(user, wasPlayed).ConfigureAwait(false);
+            await base.SetPlayedStatus(user, wasPlayed, userManager).ConfigureAwait(false);
 
             // Now sweep through recursively and update status
-            var tasks = GetChildren(user).Select(c => c.SetPlayedStatus(user, wasPlayed));
+            var tasks = GetChildren(user).Select(c => c.SetPlayedStatus(user, wasPlayed, userManager));
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
         }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 5abd3e5a8..7196b68b8 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Configuration;
 using System;
 using System.IO;
@@ -16,6 +17,8 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public class User : BaseItem
     {
+        internal static IUserManager UserManager { get; set; }
+
         /// <summary>
         /// The _root folder path
         /// </summary>
@@ -236,7 +239,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="newName">The new name.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        internal Task Rename(string newName)
+        public Task Rename(string newName)
         {
             if (string.IsNullOrEmpty(newName))
             {
@@ -364,7 +367,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                await Kernel.Instance.UserManager.UpdateUser(this).ConfigureAwait(false);
+                await UserManager.UpdateUser(this).ConfigureAwait(false);
             }
 
             return changed;
@@ -425,9 +428,9 @@ namespace MediaBrowser.Controller.Entities
         /// Resets the password by clearing it.
         /// </summary>
         /// <returns>Task.</returns>
-        public Task ResetPassword()
+        public Task ResetPassword(IUserManager userManager)
         {
-            return ChangePassword(string.Empty);
+            return ChangePassword(string.Empty, userManager);
         }
 
         /// <summary>
@@ -435,11 +438,11 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="newPassword">The new password.</param>
         /// <returns>Task.</returns>
-        public Task ChangePassword(string newPassword)
+        public Task ChangePassword(string newPassword, IUserManager userManager)
         {
             Password = string.IsNullOrEmpty(newPassword) ? string.Empty : newPassword.GetMD5().ToString();
 
-            return Kernel.Instance.UserManager.UpdateUser(this);
+            return userManager.UpdateUser(this);
         }
     }
 }