diff --git a/snprc_ehr/resources/web/snprc_ehr/buttons/bulkEditRequestButtons.js b/snprc_ehr/resources/web/snprc_ehr/buttons/bulkEditRequestButtons.js
index b31333050..ba7b9e6ee 100644
--- a/snprc_ehr/resources/web/snprc_ehr/buttons/bulkEditRequestButtons.js
+++ b/snprc_ehr/resources/web/snprc_ehr/buttons/bulkEditRequestButtons.js
@@ -75,14 +75,14 @@ SNPRC_EHR.Buttons.bulkEditRequestHandler = function(dataRegionName, formType, is
 
             function viewForm(keys){
                 var re = new RegExp('^' + window.location.origin);
-                var srcURL = window.location.href.replace(re, '');
+                var returnUrl = window.location.href.replace(re, '');
 
                 if (keys.length < 10){
-                    window.location = LABKEY.ActionURL.buildURL('ehr', 'dataEntryForm', null, {formType: formType, pkValues: keys.join(';'), srcURL: srcURL});
+                    window.location = LABKEY.ActionURL.buildURL('ehr', 'dataEntryForm', null, {formType: formType, pkValues: keys.join(';'), returnUrl: returnUrl});
                 }
                 else {
                     var newForm = Ext4.DomHelper.append(document.getElementsByTagName('body')[0],
-                            '<form method="POST" action="' + LABKEY.ActionURL.buildURL('ehr', 'dataEntryForm', null, {formType: formType, srcURL: srcURL}) + '">' +
+                            '<form method="POST" action="' + LABKEY.ActionURL.buildURL('ehr', 'dataEntryForm', null, {formType: formType, returnUrl: returnUrl}) + '">' +
                                 '<input type="hidden" name="pkValues" value="' + Ext4.htmlEncode(keys.join(';')) + '" />' +
                             '</form>');
                     newForm.submit();
diff --git a/snprc_ehr/resources/web/snprc_ehr/buttons/customDataEntryButtons.js b/snprc_ehr/resources/web/snprc_ehr/buttons/customDataEntryButtons.js
index 421238314..6b7520f3c 100644
--- a/snprc_ehr/resources/web/snprc_ehr/buttons/customDataEntryButtons.js
+++ b/snprc_ehr/resources/web/snprc_ehr/buttons/customDataEntryButtons.js
@@ -12,8 +12,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('SNPRC_REVIEW', {
     requiredQC: 'Review Required',
     targetQC: 'Review Required',
     errorThreshold: 'WARN',
-    //successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
-    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
+    successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
     disabled: true,
     itemId: 'reviewBtn',
     disableOn: 'WARN',
diff --git a/snprc_ehr/resources/web/snprc_ehr/buttons/labworkButtons.js b/snprc_ehr/resources/web/snprc_ehr/buttons/labworkButtons.js
index 913ebfa45..9d1c53b8c 100644
--- a/snprc_ehr/resources/web/snprc_ehr/buttons/labworkButtons.js
+++ b/snprc_ehr/resources/web/snprc_ehr/buttons/labworkButtons.js
@@ -137,7 +137,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('LABWORK_SUBMIT', {
     requiredQC: 'Completed',
     targetQC: 'Completed',
     errorThreshold: 'INFO',
-    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
+    successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
     disabled: true,
     itemId: 'submitBtn',
     handler: function(btn){
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/BehaviorCasesWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/BehaviorCasesWindow.js
index 29f72cc8e..a3b7d8f82 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/BehaviorCasesWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/BehaviorCasesWindow.js
@@ -211,7 +211,7 @@ Ext4.define('SNPRC_EHR.window.BehaviorCasesWindow', {
 EHR.DataEntryUtils.registerDataEntryFormButton('BEHAVIOR_CASES', {
     text: 'Close/Review Cases',
     name: 'behaviorCase',
-    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
+    successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
     disabled: true,
     itemId: 'behaviorCase',
     requiredPermissions: [
diff --git a/snprc_ehr/resources/web/snprc_ehr/window/CreateProjectWindow.js b/snprc_ehr/resources/web/snprc_ehr/window/CreateProjectWindow.js
index 41ff63fda..e5954c51a 100644
--- a/snprc_ehr/resources/web/snprc_ehr/window/CreateProjectWindow.js
+++ b/snprc_ehr/resources/web/snprc_ehr/window/CreateProjectWindow.js
@@ -76,7 +76,7 @@ Ext4.define('SNPRC_EHR.window.CreateProjectWindow', {
                             };
 
                             var newForm = Ext4.DomHelper.append(document.getElementsByTagName('body')[0],
-                                            '<form method="POST" action="' + LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'project', project: ''}) + '&returnUrl=' + LDK.Utils.getSrcURL() + '">' +
+                                            '<form method="POST" action="' + LABKEY.ActionURL.buildURL('ehr', 'dataEntryFormForQuery', null, {schemaName: 'ehr', queryName: 'project', project: ''}) + '&returnUrl=' + LDK.Utils.getReturnUrl() + '">' +
                                             '<input type="hidden" name="initialData" value="' + Ext4.htmlEncode(Ext4.encode(initialData)) + '" />' +
                                             '</form>');
                             newForm.submit();