diff --git a/app/controllers/freecen1_vld_entries_controller.rb b/app/controllers/freecen1_vld_entries_controller.rb
index 1f553a5b2..2ffa562ae 100644
--- a/app/controllers/freecen1_vld_entries_controller.rb
+++ b/app/controllers/freecen1_vld_entries_controller.rb
@@ -65,7 +65,7 @@ def propagate_pob
       if pob_invalid_count.positive?
         @freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: @freecen1_vld_file._id, pob_valid: false, id: {'$gt': params[:id]}).order_by(dwelling_number: 1, sequence_in_household: 1).first
         if @freecen1_vld_entry.blank?
-          redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)) && return
+          redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_file.id)) && return
 
         else
           redirect_to(edit_pob_freecen1_vld_entry_path(id: @freecen1_vld_entry.id)) && return
@@ -117,7 +117,7 @@ def update
         if pob_invalid_count.positive?
           @freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: @freecen1_vld_file._id, pob_valid: false, id: {'$gt': params[:id]}).order_by(dwelling_number: 1, sequence_in_household: 1).first
           if @freecen1_vld_entry.blank?
-            redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)) && return
+            redirect_to(manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_file.id)) && return
 
           else
             redirect_to(edit_pob_freecen1_vld_entry_path(id: @freecen1_vld_entry.id)) && return
diff --git a/app/helpers/freecen1_vld_entries_helper.rb b/app/helpers/freecen1_vld_entries_helper.rb
index 5e4172070..cbde3610f 100644
--- a/app/helpers/freecen1_vld_entries_helper.rb
+++ b/app/helpers/freecen1_vld_entries_helper.rb
@@ -1,2 +1,11 @@
 module Freecen1VldEntriesHelper
+
+  def skip_record(file_id, entry_id)
+    freecen1_vld_entry = Freecen1VldEntry.where(freecen1_vld_file_id: file_id, pob_valid: false, id: {'$gt': entry_id}).order_by(dwelling_number: 1, sequence_in_household: 1).first
+    if freecen1_vld_entry.blank?
+      link_to 'Skip', manual_validate_pobs_freecen1_vld_file_path(id: file_id), class: 'btn btn--small', title: 'Back (this is the last invalid entry)', data: { confirm: 'Are you sure you want to Skip this record?'}
+    else
+      link_to 'Skip', edit_pob_freecen1_vld_entry_path(id: freecen1_vld_entry.id), class: 'btn btn--small', title: 'Move to next invalid entry', data: { confirm: 'Are you sure you want to Skip this record?'}
+    end
+  end
 end
diff --git a/app/views/freecen1_vld_entries/edit_pob.html.erb b/app/views/freecen1_vld_entries/edit_pob.html.erb
index 7d8b1f3a3..3f25df52e 100644
--- a/app/views/freecen1_vld_entries/edit_pob.html.erb
+++ b/app/views/freecen1_vld_entries/edit_pob.html.erb
@@ -54,17 +54,19 @@
   <div  style='text-align: center'>
     <% if session[:propagate_pob].present? && session[:propagate_pob] == @freecen1_vld_entry.id%>
       <p><b> PROPAGATE: </b></p>
-      <%= f.submit 'Alternative',  :class => "btn btn--small", title: 'Propagate Alternative POB values only'%>
-      <%= f.submit 'Notes',  :class => "btn btn--small", title: 'Propagate Notes only'%>
-      <%= f.submit 'Both',  :class =>  "btn btn--small", title: 'Propagate Alternative POB values & Notes'%>
+      <%= f.submit 'Alternative', class: 'btn   btn--small', title: 'Propagate Alternative POB values only.'%>
+      <%= f.submit 'Notes', class: 'btn   btn--small', title: 'Propagate Notes only'%>
+      <%= f.submit 'Both', class: 'btn   btn--small', title: 'Propagate Alternative POB values & Notes'%>
     <% else%>
       <%= f.submit 'Submit',  :class => "btn btn--small", data: { confirm: 'Are you sure you want to Save the changes?'}, title: 'Saves changes.'%>
-      <%= f.submit 'Accept',  :class => "btn btn--small", data: { confirm: 'Are you sure you want to Override warnings?'}, title: 'Saves changes and overrides warnings.'%>
+      <%= f.submit 'Accept', class: 'btn   btn--small', data: { confirm: 'Are you sure you want to Override warnings?'}, title: 'Saves changes and overrides warnings.'%>
+      <br>
+      <%= skip_record(@freecen1_vld_entry.freecen1_vld_file_id, @freecen1_vld_entry._id) %>
     <% end%>
   </div>
   <div style='text-align: center'>
     <% if session[:propagate_pob].present? && session[:propagate_pob] == @freecen1_vld_entry.id%>
-      <%= f.submit 'No Propagation Required',  class: "btn btn--small", title: 'No Propagation Required'%>
+      <%= f.submit 'No Propagation Required', class: 'btn   btn--small', title: 'No Propagation Required.'%>
     <% else%>
       <%= link_to 'Cancel', manual_validate_pobs_freecen1_vld_file_path(id: @freecen1_vld_entry.freecen1_vld_file_id)%>
     <% end %>