diff --git a/app/views/branded/shared/dynamic_form/_form.html.erb b/app/views/branded/shared/dynamic_form/_form.html.erb
index 9b35cc1..d3734ff 100644
--- a/app/views/branded/shared/dynamic_form/_form.html.erb
+++ b/app/views/branded/shared/dynamic_form/_form.html.erb
@@ -38,7 +38,7 @@
           readonly: readonly,
           parent_id: fragment_id,
           schema: sub_schema,
-          field_name: prop['label'], answer_id: nil 
+          field_label: prop['label'], answer_id: nil 
           }
         ) %>
       <% end %>
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 2a71d32..4dc52a2 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
@@ -1,5 +1,6 @@
 <%# locals: { f, field_label, field_name, multiple, classname, field_name, readonly, validation } %>
 <% field_class = nil if local_assigns[:field_class].nil? %>
+<% field_label = field_label || 'No label defined' %>
 <div class="col-md-12">
   <%= f.label check_box, field_label, class: 'control-label' %>
 </div>
diff --git a/app/views/branded/shared/dynamic_form/fields/_complex_multiple_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_complex_multiple_field.html.erb
index b8ae46b..3e661cd 100644
--- a/app/views/branded/shared/dynamic_form/fields/_complex_multiple_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_complex_multiple_field.html.erb
@@ -1,11 +1,12 @@
-<%# locals: { field_values, parent_id, schema, field_name } %>
+<%# locals: { field_values, parent_id, schema, field_label} %>
 <% field_values = [] if field_values.nil? %>
+<% field_label = field_label || 'No label defined' %>
 <div class="col-md-12">
   <fieldset class="answer-fieldset">
-    <legend class="answer-fieldset"><%= field_name.capitalize.pluralize(2) %></legend>
+    <legend class="answer-fieldset"><%= field_label.capitalize.pluralize(2) %></legend>
     <table class="table table-hover linked-fragments-list <%= schema.classname %>-list">
       <thead>
-        <tr><th scope="col"><%= field_name.capitalize %></th><th scope="col">Actions</th></tr>
+        <tr><th scope="col"><%= field_label.capitalize %></th><th scope="col">Actions</th></tr>
       </thead>
       <tbody>
         <%= render(partial: 'shared/dynamic_form/linked_fragment/list', locals: {
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 1b5ef68..6e073e0 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
@@ -1,5 +1,6 @@
 <%# locals: { f, field_label, field_name, multiple, classname, field_name, readonly, validation } %>
 <% field_class = nil if local_assigns[:field_class].nil? %>
+<% field_label = field_label || 'No label defined' %>
 <% unless multiple %>
   <div class="col-md-12">
     <%= f.label field_name, field_label, class: 'control-label' %>
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 0b60894..94bb6c9 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
@@ -1,5 +1,6 @@
 <%# locals: { f, field_label, field_name, multiple, classname, field_name, readonly, validation } %>
 <% field_class = nil if local_assigns[:field_class].nil? %>
+<% field_label = field_label || 'No label defined' %>
 <% unless multiple %>
   <div class="col-md-12">
     <%= f.label field_name, field_label, class: 'control-label' %>
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 1b3f217..20dd26d 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
@@ -1,4 +1,5 @@
 <%# locals: { f, field_label, field_name, select_values, selected_value, field_class, readonly, validation } %>
+<% field_label = field_label || 'No label defined' %>
 <div class="col-md-12">
     <%= f.label field_name, field_label, class: 'control-label' %>
 </div>
diff --git a/app/views/branded/shared/dynamic_form/fields/_simple_multiple_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_simple_multiple_field.html.erb
index 430e5b0..97e5dfd 100644
--- a/app/views/branded/shared/dynamic_form/fields/_simple_multiple_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_simple_multiple_field.html.erb
@@ -1,4 +1,5 @@
 <%# locals: { f, field_values, readonly, field_label, field_properties, field_name } %>
+<% field_label = field_label || 'No label defined' %>
 <div class="col-md-12">
     <%= f.label field_name, field_label, class: 'control-label' %>
 </div>
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 e93d1e3..d71f2d4 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
@@ -1,4 +1,5 @@
 <%# locals: { f, field_label, field_name, multiple, classname, field_name, readonly, validation } %>
+<% field_label = field_label || 'No label defined' %>
 <% unless multiple %>
   <div class="col-md-12">
     <%= f.label field_name, field_label, class: 'control-label' %>