diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
index a4e4481112f..e36a347570f 100644
--- a/application/controllers/survey/index.php
+++ b/application/controllers/survey/index.php
@@ -431,8 +431,9 @@ function sendreq(surveyid)
             }
 
             // Load session before loading the values from the saved data
-            if (isset($_GET['loadall']))
+            if (isset($_POST['loadall']))
             {
+                LimeExpressionManager::SetDirtyFlag();  
                 buildsurveysession($surveyid);
             }
 
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index 00d2f63749e..123db047ca9 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -4702,10 +4702,7 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
                         }
 
                     }
-                    else if ($this->surveyOptions['allowsave'] && isset($_SESSION[$this->sessid]['scid']))
-                    {
-                        SavedControl::model()->updateByPk($_SESSION[$this->sessid]['scid'], array('saved_thisstep'=>$thisstep));
-                    }
+
                     // Check Quotas
                     $bQuotaMatched = false;
                     $aQuotas = checkQuota('return', $this->sid);