diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 0b5d2873f9..cc461a5775 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -36,6 +36,11 @@ namespace Umbraco.Core
             /// </summary>
             public static class Aliases
             {
+                /// <summary>
+                /// Block Editor.
+                /// </summary>
+                public const string BlockEditor = "Umbraco.BlockEditor";
+
                 /// <summary>
                 /// CheckBox List.
                 /// </summary>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index f647e1ae1e..b97d44d8cc 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -60,7 +60,7 @@
 
   <security>
     <!-- set to true to auto update login interval (and there by disabling the lock screen -->
-    <keepUserLoggedIn>false</keepUserLoggedIn>
+    <keepUserLoggedIn>true</keepUserLoggedIn>
     <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
     <usernameIsEmail>true</usernameIsEmail>
     <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->