diff --git a/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs b/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
index fa36745c98..f3d5178667 100644
--- a/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
+++ b/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
@@ -30,7 +30,7 @@ IMultiPageFormService multiPageFormService
             this._userFeedbackService = userFeedbackService;
             this._multiPageFormService = multiPageFormService;
             this._userFeedbackViewModel = new UserFeedbackViewModel();
-            this.config = config; 
+            this.config = config;
         }
 
         [Route("/Index")]
@@ -38,7 +38,7 @@ public IActionResult Index(string sourceUrl, string sourcePageTitle)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
             _multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);
-            
+
             _userFeedbackViewModel = new()
             {
                 UserId = User.GetUserId(),
@@ -51,13 +51,13 @@ public IActionResult Index(string sourceUrl, string sourcePageTitle)
                 TaskRating = null,
             };
 
-            if(sourcePageTitle == "Digital Learning Solutions - Page no longer available")
+            if (sourcePageTitle == "Digital Learning Solutions - Page no longer available")
             {
                 var url = ContentUrlHelper.ReplaceUrlSegment(sourceUrl);
-                _userFeedbackViewModel.SourceUrl  = url;
+                _userFeedbackViewModel.SourceUrl = url;
                 _userFeedbackViewModel.SourcePageTitle = "Welcome";
             }
-            
+
             if (_userFeedbackViewModel.UserId == null || _userFeedbackViewModel.UserId == 0)
             {
                 return GuestFeedbackStart(_userFeedbackViewModel);
@@ -198,8 +198,6 @@ public IActionResult UserFeedbackTaskAttempted(UserFeedbackViewModel userFeedbac
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
 
-            //set the source URL to the sequentially previous page route which is Task Achieved
-            userFeedbackViewModel.SourceUrl ??= "/UserFeedbackTaskAchieved";
             userFeedbackViewModel = MapMultiformDataToViewModel(userFeedbackViewModel);
 
             return View("UserFeedbackTaskAttempted", userFeedbackViewModel);
diff --git a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml
index 5e42cf46be..b665f16f5b 100644
--- a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml
+++ b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml
@@ -1,4 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.UserFeedback
+@using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 
 @model UserFeedbackViewModel;
@@ -51,44 +52,45 @@
 
         <p class="nhsuk-body-l">Step 1 of 4</p>
 
-      <form method="post" asp-action="UserFeedbackTaskAchievedSet">
-        <input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" /> @* changing the value of source URL to the current route *@
-        <input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
-        <div class="nhsuk-hint" id="task-achieve-hint">
-          Did you achieve everything you came to do today?
-        </div>
-        <fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
-          <div class="nhsuk-u-margin-bottom-6">
-            <div class="nhsuk-radios__item">
-              <input class="nhsuk-radios__input"
-                   id="feedback-achieved-yes"
-                   asp-for="TaskAchieved"
-                   type="radio"
-                   value="true">
-              <label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
-                Yes
-              </label>
+        <form method="post" asp-action="UserFeedbackTaskAchievedSet">
+            <input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" /> @* changing the value of source URL to the current route *@
+            <input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
+            <div class="nhsuk-hint" id="task-achieve-hint">
+                Did you achieve everything you came to do today?
             </div>
-            <div class="nhsuk-radios__item">
-              <input class="nhsuk-radios__input"
-                   id="feedback-achieved-no"
-                   asp-for="TaskAchieved"
-                   type="radio"
-                   value="false" />
-              <label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
-                No
-              </label>
+            <fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
+                <div class="nhsuk-u-margin-bottom-6">
+                    <div class="nhsuk-radios__item">
+                        <input class="nhsuk-radios__input"
+                               id="feedback-achieved-yes"
+                               asp-for="TaskAchieved"
+                               type="radio"
+                               value="true">
+                        <label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
+                            Yes
+                        </label>
+                    </div>
+                    <div class="nhsuk-radios__item">
+                        <input class="nhsuk-radios__input"
+                               id="feedback-achieved-no"
+                               asp-for="TaskAchieved"
+                               type="radio"
+                               value="false" />
+                        <label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
+                            No
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+            <div class="nhsuk-u-float-right">
+                <button class="nhsuk-button" type="submit">
+                    Continue
+                    <span class="feedback-chevron">
+                        <partial name="_NhsChevronRightOffset" class="feedback-chevron" />
+                    </span>
+                </button>
             </div>
-          </div>
-        </fieldset>
-        <div class="nhsuk-u-float-right">
-          <button class="nhsuk-button" type="submit">Continue
-          <span class="feedback-chevron">
-            <partial name="_NhsChevronRightOffset" class="feedback-chevron" />
-          </span>
-        </button>
-        </div>
-      </form>
+        </form>
     </div>
 </div>
 
diff --git a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml
index d7c3f702c7..cef90e1643 100644
--- a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml
+++ b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml
@@ -1,4 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.UserFeedback
+@using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 
 @model UserFeedbackViewModel;
@@ -29,7 +30,7 @@
     </div>
     <div class="nhsuk-grid-column-two-thirds">
         <form method="post" asp-action="UserFeedbackTaskAttemptedSet">
-            <input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
+            <input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" />
             <input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
 
             <p class="nhsuk-body-l">Step 2 of 4</p>
diff --git a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml
index 6609289268..4cff7a12d4 100644
--- a/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml
+++ b/DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml
@@ -1,4 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.UserFeedback
+@using Microsoft.AspNetCore.Http.Extensions
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 
 @model UserFeedbackViewModel;
@@ -31,7 +32,7 @@
         <p class="nhsuk-body-l">Step 3 of 4</p>
 
         <form method="post" asp-action="UserFeedbackTaskDifficultySet">
-            <input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
+            <input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" />
             <input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
 
             <div class="nhsuk-hint" id="feedback-difficulty-hint">