diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js
new file mode 100644
index 0000000000..c101504ea7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdisableformvalidation.directive.js
@@ -0,0 +1,20 @@
+(function() {
+  'use strict';
+
+  function UmbDisableFormValidation() {
+
+      var directive = {
+          restrict: 'A',
+          require: '?form',
+          link: function (scope, elm, attrs, ctrl) {
+              //override the $setValidity function of the form to disable validation
+              ctrl.$setValidity = function () { };
+          }
+      };
+
+    return directive;
+  }
+
+  angular.module('umbraco.directives').directive('umbDisableFormValidation', UmbDisableFormValidation);
+
+})();
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 2768c370c9..002e857b3c 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
@@ -279,6 +279,10 @@ input.umb-group-builder__group-sort-value {
   cursor: auto;
 }
 
+.umb-group-builder__property-preview .help-inline {
+    display:none !important;
+}
+
 .umb-group-builder__property-preview-overlay {
   position: absolute;
   top: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
index b191662ad1..80e854e9c2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
@@ -1 +1,2 @@
-<div ng-include="propertyEditorView"></div>
\ No newline at end of file
+
+    <div ng-include="propertyEditorView"></div>
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 76df7457db..660660cf90 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
@@ -171,7 +171,12 @@
                                     <span ng-if="property.dataTypeName == undefined">Preview</span>
                                 </span>
 
-                                <umb-property-editor model="property" ng-if="property.view !== undefined"></umb-property-editor>
+                                <ng-form name="propertyEditorPreviewForm" umb-disable-form-validation>
+                                    <umb-property-editor
+                                        ng-if="property.view !== undefined"
+                                        model="property">
+                                    </umb-property-editor>
+                                </ng-form>
 
                             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
index 8601155bda..0d1fae3f6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
@@ -1,2 +1,3 @@
-<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="10" class="umb-editor umb-textarea textstring" val-server="value"></textarea>
+<textarea ng-model="model.value" id="{{model.alias}}" name="textarea" rows="10" class="umb-editor umb-textarea textstring" val-server="value" ng-required="model.validation.mandatory"></textarea>
+<span class="help-inline" val-msg-for="textarea" val-toggle-msg="required">Required</span>
 <span class="help-inline" val-msg-for="textarea" val-toggle-msg="valServer"></span>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
index 8b9babfdfa..c55fc350fa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
@@ -2,6 +2,8 @@
     <input type="text" name="textbox" ng-model="model.value" id="{{model.alias}}"
            class="umb-editor umb-textstring textstring"
            val-server="value"
+           ng-required="model.validation.mandatory"
            ng-trim="false" />
     <span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
+    <span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
 </div>