diff --git a/src/Umbraco.Core/Models/IMemberType.cs b/src/Umbraco.Core/Models/IMemberType.cs
index 878cc24334..9596d88cca 100644
--- a/src/Umbraco.Core/Models/IMemberType.cs
+++ b/src/Umbraco.Core/Models/IMemberType.cs
@@ -19,6 +19,13 @@
         /// <returns></returns>
         bool MemberCanViewProperty(string propertyTypeAlias);
 
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is marked as storing sensitive values on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        bool IsSensitiveProperty(string propertyTypeAlias);
+
         /// <summary>
         /// Sets a boolean indicating whether a Property is editable by the Member.
         /// </summary>
@@ -32,5 +39,12 @@
         /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
         /// <param name="value">Boolean value, true or false</param>
         void SetMemberCanViewProperty(string propertyTypeAlias, bool value);
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is a sensitive value on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        void SetIsSensitiveProperty(string propertyTypeAlias, bool value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index 4f79e1d231..939c4ca8b5 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
-        /// Gets or Sets a Dictionary of Tuples (MemberCanEdit, VisibleOnProfile) by the PropertyTypes' alias.
+        /// Gets or Sets a Dictionary of Tuples (MemberCanEdit, VisibleOnProfile, IsSensitive) by the PropertyTypes' alias.
         /// </summary>
         [DataMember]
         internal IDictionary<string, MemberTypePropertyProfileAccess> MemberTypePropertyTypes { get; private set; }
@@ -99,6 +99,21 @@ namespace Umbraco.Core.Models
             return false;
         }
 
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is marked as storing sensitive values on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        public bool IsSensitiveProperty(string propertyTypeAlias)
+        {
+            if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
+            {
+                return MemberTypePropertyTypes[propertyTypeAlias].IsSensitive;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Sets a boolean indicating whether a Property is editable by the Member.
         /// </summary>
@@ -112,7 +127,7 @@ namespace Umbraco.Core.Models
             }
             else
             {
-                var tuple = new MemberTypePropertyProfileAccess(false, value);
+                var tuple = new MemberTypePropertyProfileAccess(false, value, false);
                 MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
             }
         }
@@ -130,9 +145,27 @@ namespace Umbraco.Core.Models
             }
             else
             {
-                var tuple = new MemberTypePropertyProfileAccess(value, false);
+                var tuple = new MemberTypePropertyProfileAccess(value, false, false);
+                MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
+            }
+        }
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is a sensitive value on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        public void SetIsSensitiveProperty(string propertyTypeAlias, bool value)
+        {
+            if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
+            {
+                MemberTypePropertyTypes[propertyTypeAlias].IsSensitive = value;
+            }
+            else
+            {
+                var tuple = new MemberTypePropertyProfileAccess(false, false, true);
                 MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs b/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
index fa9e0b7307..db483191a0 100644
--- a/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
+++ b/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
@@ -5,13 +5,15 @@ namespace Umbraco.Core.Models
     /// </summary>
     internal class MemberTypePropertyProfileAccess
     {
-        public MemberTypePropertyProfileAccess(bool isVisible, bool isEditable)
+        public MemberTypePropertyProfileAccess(bool isVisible, bool isEditable, bool isSenstive)
         {
             IsVisible = isVisible;
             IsEditable = isEditable;
+            IsSensitive = isSenstive;
         }
 
         public bool IsVisible { get; set; }
         public bool IsEditable { get; set; }
+        public bool IsSensitive { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Models/Rdbms/MemberTypeDto.cs b/src/Umbraco.Core/Models/Rdbms/MemberTypeDto.cs
index c9432652af..861ff1383e 100644
--- a/src/Umbraco.Core/Models/Rdbms/MemberTypeDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/MemberTypeDto.cs
@@ -27,5 +27,9 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("viewOnProfile")]
         [Constraint(Default = "0")]
         public bool ViewOnProfile { get; set; }
+
+        [Column("isSensitive")]
+        [Constraint(Default = "0")]
+        public bool IsSensitive { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs b/src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs
index d85baa2884..07c2bc421c 100644
--- a/src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs
@@ -45,6 +45,9 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("viewOnProfile")]
         public bool ViewOnProfile { get; set; }
 
+        [Column("isSensitive")]
+        public bool IsSensitive { get; set; }
+
         /* cmsDataType */
         [Column("propertyEditorAlias")]
         public string PropertyEditorAlias { get; set; }
@@ -52,7 +55,8 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("dbType")]
         public string DbType { get; set; }
 
-        [Column("UniqueID")]        
+        [Column("UniqueID")]
         public Guid UniqueId { get; set; }
+
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
index 3672f80873..4186d00774 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
@@ -84,7 +84,8 @@ namespace Umbraco.Core.Persistence.Factories
                 NodeId = entity.Id,
                 PropertyTypeId = x.Id,
                 CanEdit = memberType.MemberCanEditProperty(x.Alias),
-                ViewOnProfile = memberType.MemberCanViewProperty(x.Alias)
+                ViewOnProfile = memberType.MemberCanViewProperty(x.Alias),
+                IsSensitive = memberType.IsSensitiveProperty(x.Alias)
             }).ToList();
             return dtos;
         }
@@ -159,4 +160,4 @@ namespace Umbraco.Core.Persistence.Factories
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
index ba7a47165b..7588309fce 100644
--- a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
@@ -56,10 +56,10 @@ namespace Umbraco.Core.Persistence.Factories
 
                     //Add the standard PropertyType to the current list
                     propertyTypes.Add(standardPropertyType.Value);
-
+                    
                     //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
                     memberType.MemberTypePropertyTypes.Add(standardPropertyType.Key,
-                        new MemberTypePropertyProfileAccess(false, false));
+                        new MemberTypePropertyProfileAccess(false, false, false));
                 }
                 memberType.NoGroupPropertyTypes = propertyTypes;
 
@@ -102,7 +102,7 @@ namespace Umbraco.Core.Persistence.Factories
                 {
                     //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
                     memberType.MemberTypePropertyTypes.Add(typeDto.Alias,
-                        new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit));
+                        new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive));
 
                     var tempGroupDto = groupDto;
 
@@ -157,7 +157,7 @@ namespace Umbraco.Core.Persistence.Factories
             {
                 //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
                 memberType.MemberTypePropertyTypes.Add(typeDto.Alias,
-                    new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit));
+                    new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive));
 
                 //ensures that any built-in membership properties have their correct dbtype assigned no matter
                 //what the underlying data type is
@@ -198,4 +198,4 @@ namespace Umbraco.Core.Persistence.Factories
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenNineZero/AddTourDataUserColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenNineZero/AddTourDataUserColumn.cs
new file mode 100644
index 0000000000..1e948a7c86
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenNineZero/AddTourDataUserColumn.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.9.0", 1, Constants.System.UmbracoMigrationName)]
+    public class AddIsSensitiveMemberTypeColumn : MigrationBase
+    {
+        public AddIsSensitiveMemberTypeColumn(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            //Don't exeucte if the column is already there
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
+
+            if (columns.Any(x => x.TableName.InvariantEquals("cmsMemberType") && x.ColumnName.InvariantEquals("isSensitive")) == false)
+            {
+                Create.Column("isSensitive").OnTable("cmsMemberType").AsBoolean();
+            }
+        }
+
+        public override void Down()
+        {
+        }
+    }
+    
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4a44ef2dcc..37eead17c3 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -552,6 +552,7 @@
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddInstructionCountColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddCmsMediaTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddUserLoginTable.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddTourDataUserColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\AddIndexToDictionaryKeyColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\EnsureContentTemplatePermissions.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\ReduceDictionaryKeyColumnsSize.cs" />
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
index 1ff3447539..a976c8ad8c 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
@@ -120,6 +120,7 @@ namespace Umbraco.Tests.Models.Mapping
                     Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeDefinitionId);
                     Assert.AreEqual(propTypes.ElementAt(j).MemberCanViewProperty, result.MemberCanViewProperty(result.PropertyTypes.ElementAt(j).Alias));
                     Assert.AreEqual(propTypes.ElementAt(j).MemberCanEditProperty, result.MemberCanEditProperty(result.PropertyTypes.ElementAt(j).Alias));
+                    Assert.AreEqual(propTypes.ElementAt(j).IsSensitiveData, result.IsSensitiveProperty(result.PropertyTypes.ElementAt(j).Alias));
                 }
             }
 
@@ -335,7 +336,7 @@ namespace Umbraco.Tests.Models.Mapping
                 .Returns(new[] { new TextboxPropertyEditor() });
 
             var memberType = MockedContentTypes.CreateSimpleMemberType();
-            memberType.MemberTypePropertyTypes[memberType.PropertyTypes.Last().Alias] = new MemberTypePropertyProfileAccess(true, true);
+            memberType.MemberTypePropertyTypes[memberType.PropertyTypes.Last().Alias] = new MemberTypePropertyProfileAccess(true, true, true);
             
             MockedContentTypes.EnsureAllIds(memberType, 8888);
 
@@ -539,6 +540,7 @@ namespace Umbraco.Tests.Models.Mapping
                     {
                         MemberCanEditProperty = true,
                         MemberCanViewProperty = true,
+                        IsSensitiveData = true,
                         Id = 33,
                         SortOrder = 1,
                         Alias = "prop1",
@@ -556,6 +558,7 @@ namespace Umbraco.Tests.Models.Mapping
                     {
                         MemberCanViewProperty = false,
                         MemberCanEditProperty = false,
+                        IsSensitiveData = false,
                         Id = 34,
                         SortOrder = 2,
                         Alias = "prop2",
@@ -944,6 +947,7 @@ namespace Umbraco.Tests.Models.Mapping
                 Label = "Prop 1",
                 MemberCanViewProperty = true,
                 MemberCanEditProperty = true,
+                IsSensitiveData = true,
                 Validation = new PropertyTypeValidation()
                 {
                     Mandatory = true,
@@ -963,6 +967,7 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(basic.Validation, result.Validation);
             Assert.AreEqual(basic.MemberCanViewProperty, result.MemberCanViewProperty);
             Assert.AreEqual(basic.MemberCanEditProperty, result.MemberCanEditProperty);
+            Assert.AreEqual(basic.IsSensitiveData, result.IsSensitiveData);
         }
 
         [Test]
@@ -1029,6 +1034,7 @@ namespace Umbraco.Tests.Models.Mapping
                             {
                                 MemberCanEditProperty = true,
                                 MemberCanViewProperty = true,
+                                IsSensitiveData = true,
                                 Alias = "property1",
                                 Description = "this is property 1",
                                 Inherited = false,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index f09e31924f..714b95d873 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -56,7 +56,7 @@
                     });
 
                     var saveProperties = _.map(realProperties, function (p) {
-                        var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile');
+                        var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData');
                         return saveProperty;
                     });
 
@@ -338,4 +338,4 @@
     }
     angular.module('umbraco.services').factory('umbDataFormatter', umbDataFormatter);
 
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index c05d33db04..eecbf51ec5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -426,103 +426,114 @@ input.umb-group-builder__group-title-input {
 
 .content-type-editor-dialog.edit-property-settings {
 
-  .validation-wrapper {
-    position: relative;
-  }
-
-  .validation-label {
-    position: absolute;
-    top: 50%;
-    right: 0;
-    font-size: 12px;
-    color: @red;
-    transform: translate(0, -50%);
-  }
-
-  textarea.editor-label {
-    border-color:transparent;
-    box-shadow: none;
-    width: 100%;
-    box-sizing: border-box;
-    margin-bottom: 0;
-    font-size: 16px;
-    font-weight: bold;
-    resize: none;
-    line-height: 1.5em;
-    padding-left: 0;
-    border: none;
-    &:focus {
-      outline: none;
-      box-shadow: none !important;
+    .validation-wrapper {
+        position: relative;
     }
-  }
 
-  .editor-placeholder {
-    border: 1px dashed @gray-8;
-    width: 100%;
-    height: 80px;
-    line-height: 80px;
-    text-align: center;
-    display: block;
-    border-radius: 5px;
-    color: @gray-3;
-    font-weight: bold;
-    font-size: 14px;
-    color: @turquoise-d1;
-    &:hover {
-      text-decoration: none;
-    }
-  }
-
-  .editor {
-    margin-bottom: 10px;
-    .editor-icon-wrapper {
-      border: 1px solid @gray-8;
-      width: 60px;
-      height: 60px;
-      text-align: center;
-      line-height: 60px;
-      border-radius: 5px;
-      float: left;
-      margin-right: 20px;
-      .icon {
-        font-size: 26px;
-      }
-    }
-    .editor-details {
-      float: left;
-      margin-top: 10px;
-      .editor-name {
-        display: block;
-        font-weight: bold;
-      }
-      .editor-editor {
-        display: block;
+    .validation-label {
+        position: absolute;
+        top: 50%;
+        right: 0;
         font-size: 12px;
-      }
+        color: @red;
+        transform: translate(0, -50%);
     }
-    .editor-settings-icon {
-      font-size: 18px;
-      margin-top: 8px;
-   }
-  }
 
-  .checkbox {
-    margin-bottom: 20px;
-  }
+    textarea.editor-label {
+        border-color: transparent;
+        box-shadow: none;
+        width: 100%;
+        box-sizing: border-box;
+        margin-bottom: 0;
+        font-size: 16px;
+        font-weight: bold;
+        resize: none;
+        line-height: 1.5em;
+        padding-left: 0;
+        border: none;
 
-  .editor-description,
-  .editor-validation-pattern {
-    min-width: 100%;
-    min-height: 25px;
-    resize: none;
-    box-sizing: border-box;
-    border: none;
-    overflow: hidden;
-  }
+        &:focus {
+            outline: none;
+            box-shadow: none !important;
+        }
+    }
 
-  .umb-dropdown {
-    width: 100%;
-  }
+    .editor-placeholder {
+        border: 1px dashed @gray-8;
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        text-align: center;
+        display: block;
+        border-radius: 5px;
+        color: @gray-3;
+        font-weight: bold;
+        font-size: 14px;
+        color: @turquoise-d1;
 
+        &:hover {
+            text-decoration: none;
+        }
+    }
+
+    .editor {
+        margin-bottom: 10px;
+
+        .editor-icon-wrapper {
+            border: 1px solid @gray-8;
+            width: 60px;
+            height: 60px;
+            text-align: center;
+            line-height: 60px;
+            border-radius: 5px;
+            float: left;
+            margin-right: 20px;
+
+            .icon {
+                font-size: 26px;
+            }
+        }
+
+        .editor-details {
+            float: left;
+            margin-top: 10px;
+
+            .editor-name {
+                display: block;
+                font-weight: bold;
+            }
+
+            .editor-editor {
+                display: block;
+                font-size: 12px;
+            }
+        }
+
+        .editor-settings-icon {
+            font-size: 18px;
+            margin-top: 8px;
+        }
+    }
+
+    .checkbox {
+        margin-bottom: 20px;
+    }
+
+    .editor-description,
+    .editor-validation-pattern {
+        min-width: 100%;
+        min-height: 25px;
+        resize: none;
+        box-sizing: border-box;
+        border: none;
+        overflow: hidden;
+    }
+
+    .umb-dropdown {
+        width: 100%;
+    }
+
+    label.checkbox.no-indent {
+        width: 100%;
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
index 50e5e29d1e..05da7e1ded 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
@@ -90,8 +90,8 @@
 
    <div class="umb-control-group clearfix" ng-if="model.contentType === 'memberType'">
 
-       <h5><localize key="general_rights"></localize></h5>
-
+       <h5><localize key="general_options"></localize></h5>
+       
        <label class="checkbox no-indent">
           <input type="checkbox" ng-model="model.property.showOnMemberProfile">
           <localize key="contentTypeEditor_showOnMemberProfile"></localize>
@@ -102,6 +102,11 @@
          <localize key="contentTypeEditor_memberCanEdit"></localize>
       </label>
 
+       <label class="checkbox no-indent">
+           <input type="checkbox" ng-model="model.property.isSensitiveData">
+           <localize key="contentTypeEditor_isSensitiveData"></localize>
+       </label>
+
    </div>
 
    <umb-overlay
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index f414d60c39..744075b6ce 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -221,6 +221,11 @@
                                         <localize key="contentTypeEditor_memberCanEdit"></localize>
                                     </div>
 
+                                    <div class="umb-group-builder__property-tag -white" ng-if="property.isSensitiveData">
+                                        <i class="icon-lock umb-group-builder__property-tag-icon"></i>
+                                        <localize key="contentTypeEditor_isSensitiveData"></localize>
+                                    </div>
+
                                 </div>
 
                                 <div class="umb-group-builder__property-tags -right">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 1bd8673b43..61d00b4a49 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -510,6 +510,7 @@
         <key alias="missingPropertyEditorErrorMessage">There is a configuration error with the data type used for this property, please check the data type</key>
     </area>
     <area alias="general">
+        <key alias="options">Options</key>
         <key alias="about">About</key>
         <key alias="action">Action</key>
         <key alias="actions">Actions</key>
@@ -1609,6 +1610,7 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="thisEditorUpdateSettings">using this editor will get updated with the new settings</key>
 
         <key alias="memberCanEdit">Member can edit</key>
+        <key alias="isSensitiveData">Is sensitive data</key>
         <key alias="showOnMemberProfile">Show on member profile</key>
         <key alias="tabHasNoSortOrder">tab has no sort order</key>
     </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index b9375420bd..dbf20229ef 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -516,6 +516,7 @@
         <key alias="missingPropertyEditorErrorMessage">There is a configuration error with the data type used for this property, please check the data type</key>
     </area>
     <area alias="general">
+        <key alias="options">Options</key>
         <key alias="about">About</key>
         <key alias="action">Action</key>
         <key alias="actions">Actions</key>
@@ -1613,6 +1614,7 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="thisEditorUpdateSettings">using this editor will get updated with the new settings</key>
 
         <key alias="memberCanEdit">Member can edit</key>
+        <key alias="isSensitiveData">Is sensitive data</key>
         <key alias="showOnMemberProfile">Show on member profile</key>
         <key alias="tabHasNoSortOrder">tab has no sort order</key>
     </area>
diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeBasic.cs b/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeBasic.cs
index dfe98461dd..a1f5af645b 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeBasic.cs
@@ -13,5 +13,8 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "memberCanEdit")]
         public bool MemberCanEditProperty { get; set; }
+
+        [DataMember(Name = "isSensitiveData")]
+        public bool IsSensitiveData { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeDisplay.cs
index 8f7d4be310..bdbf19e68e 100644
--- a/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MemberPropertyTypeDisplay.cs
@@ -10,5 +10,8 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "memberCanEdit")]
         public bool MemberCanEditProperty { get; set; }
+
+        [DataMember(Name = "isSensitiveData")]
+        public bool IsSensitiveData { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
index 3daf22f172..7ab2e63dbc 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Web.Models.Mapping
                 {
                     ContentTypeModelMapperExtensions.AfterMapContentTypeSaveToEntity(source, dest, applicationContext);
 
-                    //map the MemberCanEditProperty,MemberCanViewProperty
+                    //map the MemberCanEditProperty,MemberCanViewProperty,IsSensitiveData
                     foreach (var propertyType in source.Groups.SelectMany(x => x.Properties))
                     {
                         var localCopy = propertyType;
@@ -97,6 +97,7 @@ namespace Umbraco.Web.Models.Mapping
                         {
                             dest.SetMemberCanEditProperty(localCopy.Alias, localCopy.MemberCanEditProperty);
                             dest.SetMemberCanViewProperty(localCopy.Alias, localCopy.MemberCanViewProperty);
+                            dest.SetIsSensitiveProperty(localCopy.Alias, localCopy.IsSensitiveData);
                         }
                     }
                 });
@@ -108,7 +109,7 @@ namespace Umbraco.Web.Models.Mapping
                 .MapBaseContentTypeEntityToDisplay<IMemberType, MemberTypeDisplay, MemberPropertyTypeDisplay>(applicationContext, _propertyEditorResolver)
                 .AfterMap((memberType, display) =>
                 {
-                    //map the MemberCanEditProperty,MemberCanViewProperty
+                    //map the MemberCanEditProperty,MemberCanViewProperty,IsSensitiveData
                     foreach (var propertyType in memberType.PropertyTypes)
                     {
                         var localCopy = propertyType;
@@ -117,6 +118,7 @@ namespace Umbraco.Web.Models.Mapping
                         {
                             displayProp.MemberCanEditProperty = memberType.MemberCanEditProperty(localCopy.Alias);
                             displayProp.MemberCanViewProperty = memberType.MemberCanViewProperty(localCopy.Alias);
+                            displayProp.IsSensitiveData = memberType.IsSensitiveProperty(localCopy.Alias);
                         }
                     }
                 });
@@ -284,4 +286,4 @@ namespace Umbraco.Web.Models.Mapping
 
 
     }
-}
\ No newline at end of file
+}