diff --git a/code/web/Drivers/Koha.php b/code/web/Drivers/Koha.php
index e6b6725270..54037e9dd8 100644
--- a/code/web/Drivers/Koha.php
+++ b/code/web/Drivers/Koha.php
@@ -3651,6 +3651,9 @@ function processEmailResetPinForm() {
 				$error = str_replace('<h3>', '<h4>', $error);
 				$error = str_replace('</h3>', '</h4>', $error);
 				$error = str_replace('/cgi-bin/koha/opac-password-recovery.pl', '/MyAccount/EmailResetPin', $error);
+				if ($kohaVersion >= 24.05) {
+					$error = str_replace('#', '/MyAccount/EmailResetPin', $error);
+				}
 				$result['error'] = trim($error);
 			} elseif (preg_match('%<div id="password-recovery">\s+<div class="alert alert-info">(.*?)<a href="/cgi-bin/koha/opac-main.pl">Return to the main page</a>\s+</div>\s+</div>%s', $postResults, $messageInformation)) {
 				$message = $messageInformation[1];
diff --git a/code/web/release_notes/24.07.02.MD b/code/web/release_notes/24.07.02.MD
index 7add6a2419..3477a75d1b 100644
--- a/code/web/release_notes/24.07.02.MD
+++ b/code/web/release_notes/24.07.02.MD
@@ -1,4 +1,7 @@
 ## Aspen Discovery Updates
+### Koha Updates
+- Fix issues related to resending a password reset link on Koha version 24.05. (*KK*)
+
 ### Polaris Updates
 - Discard any item fields from the base MARC record retrieved from Polaris to avoid conflicts with actual items during indexing. (Tickets 135614, 135843) (*MDN*)
 
@@ -8,3 +11,4 @@
 ## This release includes code contributions from
 - ByWater Solutions
   - Mark Noble (MDN)
+  - Kirstien Kroeger (KK)
\ No newline at end of file