diff --git a/templates/look-and-feel/layouts/check_your_answers.html b/templates/look-and-feel/layouts/check_your_answers.html
index 9b05fe5..a5bed96 100644
--- a/templates/look-and-feel/layouts/check_your_answers.html
+++ b/templates/look-and-feel/layouts/check_your_answers.html
@@ -58,7 +58,7 @@
       {{ header('Now send your application', size='medium') }}
       <p>{{ pageContent.statementOfTruth | default(defaultContent.statementOfTruth) }}</p>
     {% endblock %}
-    <form action="{{ path if path else url }}" method="post" class="form">
+    <form action="{{ postUrl | default(path if path else url) }}" method="post" class="form">
 
       {% block statement_of_truth_fields %}
         {{ hiddenInput(fields.statementOfTruth, value=true) }}
diff --git a/templates/look-and-feel/layouts/question.html b/templates/look-and-feel/layouts/question.html
index cb0e61b..0d68652 100644
--- a/templates/look-and-feel/layouts/question.html
+++ b/templates/look-and-feel/layouts/question.html
@@ -13,7 +13,7 @@
 
 {{ header(title, size='large') }}
 
-<form action="{{ path if path else url }}" method="post" class="form">
+<form action="{{ postUrl | default(path if path else url) }}" method="post" class="form">
 
   {%- if fields.validated and not fields.valid -%}
     <div class="error-summary" role="group" aria-labelledby="error-summary-heading" tabindex="-1">