diff --git a/code/MultiForm.php b/code/MultiForm.php
index 3f32923..22908ea 100644
--- a/code/MultiForm.php
+++ b/code/MultiForm.php
@@ -199,6 +199,8 @@ abstract class MultiForm extends Form {
 	 */
 	protected function setCurrentStep($step) {
 		$this->session->CurrentStepID = $step->ID;
+		$step->setForm($this);
+
 		return $this->session->write();
 	}
 	
diff --git a/code/MultiFormStep.php b/code/MultiFormStep.php
index a3b3998..c05d71c 100644
--- a/code/MultiFormStep.php
+++ b/code/MultiFormStep.php
@@ -263,6 +263,8 @@ class MultiFormStep extends DataObject {
 		$steps = DataObject::get('MultiFormStep', "\"SessionID\" = {$this->SessionID}", '"LastEdited" DESC');
 		if($steps) {
 			foreach($steps as $step) {
+				$step->setForm($this->form);
+
 				if($step->getNextStep()) {
 					if($step->getNextStep() == $this->class) {
 						return $step->class;