diff --git a/src/Umbraco.Tests/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/AngularIntegration/JsInitializationTests.cs
index 6251134dbc..1b3b14516d 100644
--- a/src/Umbraco.Tests/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/AngularIntegration/JsInitializationTests.cs
@@ -31,7 +31,9 @@ namespace Umbraco.Tests.AngularIntegration
     UmbClientMgr.setUmbracoPath('Hello');
 
     jQuery(document).ready(function () {
+
         angular.bootstrap(document, ['umbraco']);
+
     });
 });", result);
         }
diff --git a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
index 782626e912..be8b6119d8 100644
--- a/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
+++ b/src/Umbraco.Tests/Plugins/PluginManagerTests.cs
@@ -268,7 +268,7 @@ namespace Umbraco.Tests.Plugins
         public void Resolves_Assigned_Mappers()
         {
             var foundTypes1 = _manager.ResolveAssignedMapperTypes();
-            Assert.AreEqual(25, foundTypes1.Count());
+            Assert.AreEqual(26, foundTypes1.Count());
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
index 576a21d5ac..906027086d 100644
--- a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
@@ -79,8 +79,8 @@ namespace Umbraco.Tests.Plugins
             var originalTypesFound = TypeFinderOriginal.FindClassesOfType<IApplicationStartupHandler>(_assemblies);
 
             Assert.AreEqual(originalTypesFound.Count(), typesFound.Count());
-            Assert.AreEqual(7, typesFound.Count());
-            Assert.AreEqual(7, originalTypesFound.Count());
+            Assert.AreEqual(8, typesFound.Count());
+            Assert.AreEqual(8, originalTypesFound.Count());
         }
 
         [Test]
diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
index 7200f2a7c2..afae0eb122 100644
--- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
@@ -50,7 +50,8 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(detail => detail.StartContentNode, opt => opt.MapFrom(user => user.StartContentId))
                 .ForMember(detail => detail.StartMediaNode, opt => opt.MapFrom(user => user.StartMediaId))
                 .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.Username))
-                .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)));
+                .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
+                .ForMember(detail => detail.SessionId, opt => opt.MapFrom(user => user.SecurityStamp.IsNullOrWhiteSpace() ? Guid.NewGuid().ToString("N") : user.SecurityStamp));
 
         }