From 8842058d286a2b6c9f435a964ba59aae933100a9 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Mon, 6 Jan 2025 12:46:48 +0000
Subject: [PATCH] TD-5130: Fixed unknown error

---
 .../Views/Account/CreateAccountSearchRole.cshtml               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
index e42fd6f45..af00e7ca5 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
@@ -5,7 +5,8 @@
 @{
     ViewData["Title"] = "Role";
     var errorHasOccurred = !ViewData.ModelState.IsValid;
-    var routeData = new Dictionary<string, string> { { "CountryId", Context.Request.Query["CountryId"] } };
+    string currentCountry = !string.IsNullOrWhiteSpace(Context.Request.Query["CountryId"]) ? Context.Request.Query["CountryId"] : Model.CountryId;
+    var routeData = new Dictionary<string, string> { { "CountryId", currentCountry } };
 }
 
 @section styles{