diff --git a/app/views/admin/property_hires/edit_hire.html.erb b/app/views/admin/property_hires/edit_hire.html.erb
index d4f3ddb..97ce03a 100644
--- a/app/views/admin/property_hires/edit_hire.html.erb
+++ b/app/views/admin/property_hires/edit_hire.html.erb
@@ -725,6 +725,7 @@ ul.list-unstyled li {
     <% if has_p_hire_fields && field_name.include?("p_hire_fields") %>
       <div class="form-group">
         <% rf = p_hire_fields[field_name.sub("p_hire_fields.",'')] %>
+        <% next if rf.nil? %>
         <%= rf.block_helper(property,@form_index,false,"p_hire",hire, rf.to_require,label_col) %>
       </div>
       <% @form_index = @form_index +1 %>
diff --git a/app/views/admin/property_hires/fields_display_order.html.erb b/app/views/admin/property_hires/fields_display_order.html.erb
index 5ad3f37..ae6a6fb 100644
--- a/app/views/admin/property_hires/fields_display_order.html.erb
+++ b/app/views/admin/property_hires/fields_display_order.html.erb
@@ -36,13 +36,22 @@
 				</thead>
 				<tbody>
 					<% @property.custom_field_names.each_with_index do |field_name,i| %>
+						<% p_hire_field = nil
+						 if field_name.include?("p_hire_fields") %>
+							 p_hire_field = p_hire_fields[field_name.sub("p_hire_fields.",'')]
+							 next if p_hire_field.nil?
+						 end %>
 						<tr data-index="<%=i%>">
 							<td><span class="brand"><i class="icons-list-2"></i></span></td>
 							<td class="position-text">
 								<div class="position-text-div" data-value="<%= (i + 1).to_s %>"><%= (i + 1).to_s  %></div>
 							</td>
 							<td>
-								<%= field_name.include?("p_hire_fields") ? p_hire_fields[field_name.sub("p_hire_fields.",'')].title : @property.custom_text(field_name) %>
+								<% if p_hire_field %>
+									<%= p_hire_field.title %>
+								<% else %>
+									<%= @property.custom_text(field_name) %>
+								<% end %>
 								<%= hidden_field_tag "#{f.object_name}[custom_field_names][]", field_name %>
 							</td>
 						</tr>
diff --git a/app/views/property_hires/hire.html.erb b/app/views/property_hires/hire.html.erb
index 5532888..a4ec3c7 100644
--- a/app/views/property_hires/hire.html.erb
+++ b/app/views/property_hires/hire.html.erb
@@ -568,6 +568,7 @@
     <% if has_p_hire_fields && field_name.include?("p_hire_fields") %>
       <div class="form-group">
         <% rf = p_hire_fields[field_name.sub("p_hire_fields.",'')] %>
+        <% next if rf.nil? %>
         <%= rf.block_helper(property,@form_index,false,"p_hire",hire, rf.to_require,label_col) %>
       </div>
       <% @form_index = @form_index +1 %>