diff --git a/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy b/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy
index b36a7fe4439..4134a1a209d 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy
+++ b/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy
@@ -31,7 +31,7 @@ sendTo = request.getParameter("sendTo");
 context.partyId = partyId;
 context.sendTo = sendTo;
 
-donePage = request.getParameter("DONE_PAGE") ?: "orderview?orderId=" + orderId;
+donePage = request.getParameter("DONE_PAGE") ?: "orderview";
 context.donePage = donePage;
 
 // Provide the correct order confirmation ProductStoreEmailSetting, if one exists
diff --git a/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl b/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
index 0a8f82e6d38..d1caf68e85d 100644
--- a/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
+++ b/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
@@ -26,10 +26,11 @@ under the License.
       <br class="clear"/>
     </div>
     <div class="screenlet-body">
-      <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
-      <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
+      <a href="<@ofbizUrl>authview/${donePage}?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+      <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>      
       <br />
       <form method="post" action="<@ofbizUrl>sendconfirmationmail/${donePage}</@ofbizUrl>" name="sendConfirmationForm">
+        <input type="hidden" name="orderId" value="${orderId?if_exists}" />
         <#if ! productStoreEmailSetting?exists>
             <#assign productStoreEmailSetting = {} />
         </#if>