diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
index aa47e0c667..a0b3f8494d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
@@ -4,6 +4,7 @@
 
         <umb-toggle input-id="{{model.alias}}"
                     checked="renderModel.value"
+                    disabled="model.readonly"
                     on-click="toggle()"
                     show-labels="{{model.config.showLabels}}"
                     label-position="right"
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
index 6877806dee..9150e31ca2 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
@@ -53,29 +53,21 @@ namespace Umbraco.Web.Models.Mapping
 
             var resolved = base.Map(source, context);
 
-            if (provider.IsUmbracoMembershipProvider() == false)
+            // IMember.IsLockedOut can't be set to true, so make it readonly when that's the case (you can only unlock)
+            var isLockedOutPropertyAlias = Constants.Conventions.Member.IsLockedOut;
+            if (provider.IsUmbracoMembershipProvider() &&
+                provider is IUmbracoMemberTypeMembershipProvider umbracoProvider)
             {
-                // it's a generic provider so update the locked out property based on our known constant alias
-                var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == Constants.Conventions.Member.IsLockedOut);
-                if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1")
-                {
-                    isLockedOutProperty.View = "readonlyvalue";
-                    isLockedOutProperty.Value = _localizedTextService.Localize("general", "no");
-                }
-            }
-            else
-            {
-                var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider;
-
                 // This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
                 // if we just had all of the membership provider fields on the member table :(
                 // TODO: But is there a way to map the IMember.IsLockedOut to the property ? i dunno.
-                var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == umbracoProvider.LockPropertyTypeAlias);
-                if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1")
-                {
-                    isLockedOutProperty.View = "readonlyvalue";
-                    isLockedOutProperty.Value = _localizedTextService.Localize("general", "no");
-                }
+                isLockedOutPropertyAlias = umbracoProvider.LockPropertyTypeAlias;
+            }
+
+            var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == isLockedOutPropertyAlias);
+            if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1")
+            {
+                isLockedOutProperty.Readonly = true;
             }
 
             return resolved;