diff --git a/code/model/MultiFormStep.php b/code/model/MultiFormStep.php
index 49ebe6d..b9c910f 100644
--- a/code/model/MultiFormStep.php
+++ b/code/model/MultiFormStep.php
@@ -141,7 +141,13 @@ class MultiFormStep extends DataObject {
 	 */
 	public function Link() {
 		$form = $this->form;
-		return Controller::join_links($form->getDisplayLink(), "?{$form->config()->get_var}={$this->Session()->Hash}");
+		return Controller::join_links(
+			$form->getDisplayLink(),
+			'?' . http_build_query(array(
+				$form->getGetVar() => $this->Session()->Hash,
+				'StepID' => $this->ID,
+			))
+		);
 	}
 
 	/**
diff --git a/templates/Includes/MultiFormProgressList.ss b/templates/Includes/MultiFormProgressList.ss
index 59a420d..441cca5 100644
--- a/templates/Includes/MultiFormProgressList.ss
+++ b/templates/Includes/MultiFormProgressList.ss
@@ -1,7 +1,7 @@
 <ul class="stepIndicator current-$CurrentStep.class">
 <% loop AllStepsLinear %>
 	<li class="$ClassName<% if LinkingMode %> $LinkingMode<% end_if %><% if FirstLast %> $FirstLast<% end_if %><% if $ExtraClasses %> $ExtraClasses<% end_if %>">
-		<% if LinkingMode = current %><% else %><% if ID %><a href="{$Top.URLSegment}/?${Top.GetVar}={$SessionID}&amp;StepID={$ID}"><% end_if %><% end_if %>
+		<% if LinkingMode = current %><% else %><% if ID %><a href="$Link"><% end_if %><% end_if %>
 		<% if Title %>$Title<% else %>$ClassName<% end_if %>
 		<% if LinkingMode = current %><% else %><% if ID %></a><% end_if %><% end_if %>
 	</li>