diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 1fd0a5cc61..b064224947 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -596,8 +596,8 @@
                         <tr>
                             <th scope="row"><strong>Warning</strong> </th>
                             <td
-                                >System preference 'NotifyPasswordChange' is enabled, but the PASSWORD_CHANGE notice template is missing. Password changes will fail. Please create the PASSWORD_CHANGE notice template in
-                                <a href="/cgi-bin/koha/tools/letter.pl">Tools &gt; Notices and slips</a>.</td
+                                >System preference 'NotifyPasswordChange' is enabled, but the PASSWORD_CHANGE notice template is missing. Patrons will not be notified about password changes. Please create the PASSWORD_CHANGE notice template
+                                in <a href="/cgi-bin/koha/tools/letter.pl">Tools &gt; Notices and slips</a>.</td
                             >
                         </tr>
                     [% END %]
diff --git a/t/db_dependent/Koha/Patron.t b/t/db_dependent/Koha/Patron.t
index d2d8182c81..b9c1eedc66 100755
--- a/t/db_dependent/Koha/Patron.t
+++ b/t/db_dependent/Koha/Patron.t
@@ -1546,6 +1546,7 @@ subtest 'password expiration tests' => sub {
         my $date = dt_from_string();
         my $category =
             $builder->build_object( { class => 'Koha::Patron::Categories', value => { password_expiry_days => 10 } } );
+        Koha::Notice::Templates->search( { code => 'PASSWORD_CHANGE', module => 'members' } )->delete;
         my $patron = $builder->build_object(
             {
                 class => 'Koha::Patrons',