diff --git a/survey_builder/code/ui/frontend/SurveyPage.php b/survey_builder/code/ui/frontend/SurveyPage.php
index 7cfe1bd466..32b094c1b8 100644
--- a/survey_builder/code/ui/frontend/SurveyPage.php
+++ b/survey_builder/code/ui/frontend/SurveyPage.php
@@ -703,15 +703,14 @@ public function EditEntity($request)
                     {
                         // if we are not allowed to go to desired step , redirect to current step
 
-                        $current_url = Controller::join_links
+                        $current_url = Director::absoluteURL(Controller::join_links
                         (
-                            Director::absoluteBaseURL(),
                             $this->Link(),
                             $step,
                             'edit',
                             $entity_survey_id,
                             $entity_step_template->title()
-                        );
+                        ));
 
                         return $this->redirect($current_url);
                     }
diff --git a/survey_builder/code/ui/frontend/builders/EntitySurveyRegularStepTemplateUIBuilder.php b/survey_builder/code/ui/frontend/builders/EntitySurveyRegularStepTemplateUIBuilder.php
index d741c64415..17f6d3fb2d 100644
--- a/survey_builder/code/ui/frontend/builders/EntitySurveyRegularStepTemplateUIBuilder.php
+++ b/survey_builder/code/ui/frontend/builders/EntitySurveyRegularStepTemplateUIBuilder.php
@@ -71,15 +71,14 @@ protected function getPreviousStepUrl(ISurveyStep $previous_step)
             throw new LogicException('step empty! - member_id %s', Member::currentUserID());
 
         $entity_survey_id = intval($request->param('ENTITY_SURVEY_ID'));
-        $prev_step_url = Controller::join_links
+        $prev_step_url = Director::absoluteURL(Controller::join_links
         (
-            Director::absoluteBaseURL(),
             Controller::curr()->Link(),
             $step,
             'edit',
             $entity_survey_id,
             $previous_step->template()->title()
-        );
+        ));
         return $prev_step_url;
     }
 }
\ No newline at end of file
diff --git a/survey_builder/code/ui/frontend/builders/SurveyAbstractStepTemplateUIBuilder.php b/survey_builder/code/ui/frontend/builders/SurveyAbstractStepTemplateUIBuilder.php
index 5163815b87..789ee7ac4c 100644
--- a/survey_builder/code/ui/frontend/builders/SurveyAbstractStepTemplateUIBuilder.php
+++ b/survey_builder/code/ui/frontend/builders/SurveyAbstractStepTemplateUIBuilder.php
@@ -38,12 +38,11 @@ public function setNextButtonTitle($next_btn_title){
      * @return String
      */
     protected function getPreviousStepUrl(ISurveyStep $previous_step){
-        $prev_step_url = Controller::join_links
+        $prev_step_url = Director::absoluteURL(Controller::join_links
         (
-            Director::absoluteBaseURL(),
             Controller::curr()->Link(),
             $previous_step->template()->title()
-        );
+        ));
         return $prev_step_url;
     }
 
diff --git a/survey_builder/code/ui/frontend/builders/SurveyReviewStepTemplateUIBuilder.php b/survey_builder/code/ui/frontend/builders/SurveyReviewStepTemplateUIBuilder.php
index d8c62801d2..beab722da6 100644
--- a/survey_builder/code/ui/frontend/builders/SurveyReviewStepTemplateUIBuilder.php
+++ b/survey_builder/code/ui/frontend/builders/SurveyReviewStepTemplateUIBuilder.php
@@ -48,12 +48,11 @@ public function build(ISurveyStep $step, $action, $form_name = 'SurveyStepForm')
      * @return String
      */
     protected function getPreviousStepUrl(ISurveyStep $previous_step){
-        $prev_step_url        = Controller::join_links
+        $prev_step_url        = Director::absoluteURL(Controller::join_links
         (
-            Director::absoluteBaseURL(),
             Controller::curr()->Link(),
             $previous_step->template()->title()
-        );
+        ));
         return $prev_step_url;
     }