diff --git a/app/views/branded/shared/dynamic_form/_form.html.erb b/app/views/branded/shared/dynamic_form/_form.html.erb
index b54c444..08f8874 100644
--- a/app/views/branded/shared/dynamic_form/_form.html.erb
+++ b/app/views/branded/shared/dynamic_form/_form.html.erb
@@ -1,7 +1,7 @@
 <%# locals: { f, fragment, schema, readonly, classname, fragment_id } %>
 <% sub_schemas = schema.get_sub_schemas %>
 <% data = fragment.data unless fragment.nil? %>
-<% validations = data.present? && data['validations'].present? ? data["validations"] : {} %>
+<% validations = data.present? && data['validations'].present? ? data["validations"] : nil %>
 
 <% sub_fragments = fragment.present? ? fragment.get_sub_fragments() : [] %>
 <% schema_properties = schema.schema["properties"]%>
@@ -9,7 +9,7 @@
 <% schema_properties.each do |key, prop| %>
   <% value = data[key] unless data.nil? %>
   <% field_name = defined?(form_prefix) ? "#{form_prefix}[#{key}]" : key %>
-  <% validation = validations[key] %>
+  <% validation = validations.nil? ? "none" : validations[key] %>
   <% case prop['type'] %>
   <% when 'string' %>
     <% if prop['format'].nil?%>
diff --git a/app/views/branded/shared/dynamic_form/_validation_indicator.html.erb b/app/views/branded/shared/dynamic_form/_validation_indicator.html.erb
index a411fb7..d2244f8 100644
--- a/app/views/branded/shared/dynamic_form/_validation_indicator.html.erb
+++ b/app/views/branded/shared/dynamic_form/_validation_indicator.html.erb
@@ -1,6 +1,8 @@
-<% if validation.nil? %>
-    <span class="fa fa-check-circle valid"></span>
-<% else %>
-    <span class="fa fa-times-circle invalid"></span>
-    <span class="fa fa-question-circle explanation" title="<%= display_validation_message(validation) %>"></span>
+<% unless validation == "none" %>
+    <% if validation.nil? %>
+        <span class="fa fa-check-circle valid"></span>
+    <% else %>
+        <span class="fa fa-times-circle invalid"></span>
+        <span class="fa fa-question-circle explanation" title="<%= display_validation_message(validation) %>"></span>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/branded/shared/dynamic_form/fields/_checkbox_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_checkbox_field.html.erb
index c598f83..2a71d32 100644
--- a/app/views/branded/shared/dynamic_form/fields/_checkbox_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_checkbox_field.html.erb
@@ -9,9 +9,9 @@
             multiple: multiple, 
             disabled: readonly,
             class: "form-control #{field_class}" %>
-  
+
   <%= render partial: "shared/dynamic_form/validation_indicator", locals: {
                 validation: validation
-      }
+      } unless validation == "none"
   %>
 </div>
diff --git a/app/views/branded/shared/dynamic_form/fields/_date_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_date_field.html.erb
index 8f523e4..1b5ef68 100644
--- a/app/views/branded/shared/dynamic_form/fields/_date_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_date_field.html.erb
@@ -24,6 +24,6 @@
 
   <%= render partial: "shared/dynamic_form/validation_indicator", locals: {
                 validation: validation
-      }
+      } unless validation == "none"
   %>
 </div>
diff --git a/app/views/branded/shared/dynamic_form/fields/_number_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_number_field.html.erb
index 8b2e87b..0b60894 100644
--- a/app/views/branded/shared/dynamic_form/fields/_number_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_number_field.html.erb
@@ -23,6 +23,6 @@
   <% end %>
   <%= render partial: "shared/dynamic_form/validation_indicator", locals: {
                 validation: validation
-      }
+      } unless validation == "none"
   %>
 </div>
diff --git a/app/views/branded/shared/dynamic_form/fields/_select_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_select_field.html.erb
index dae8685..1b3f217 100644
--- a/app/views/branded/shared/dynamic_form/fields/_select_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_select_field.html.erb
@@ -10,6 +10,6 @@
                 class: "form-control #{field_class}" %>
     <%= render partial: "shared/dynamic_form/validation_indicator", locals: {
                     validation: validation
-        }
+        } unless validation == "none"
     %>
 </div>
\ No newline at end of file
diff --git a/app/views/branded/shared/dynamic_form/fields/_text_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_text_field.html.erb
index b5e98c3..e93d1e3 100644
--- a/app/views/branded/shared/dynamic_form/fields/_text_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_text_field.html.erb
@@ -21,8 +21,9 @@
       <% end %>
     </div>
   <% end %>
+  
   <%= render partial: "shared/dynamic_form/validation_indicator", locals: {
                 validation: validation
-      }
+      } unless validation == "none"
   %>
 </div>