diff --git a/Koha/Template/Plugin/Categories.pm b/Koha/Template/Plugin/Categories.pm
index fe8b0d74d9..acd94fb299 100644
--- a/Koha/Template/Plugin/Categories.pm
+++ b/Koha/Template/Plugin/Categories.pm
@@ -21,15 +21,12 @@ use Template::Plugin;
 use base qw( Template::Plugin );
 
 use C4::Category;
-use Koha::Database;
+use Koha::Patron::Categories;
 
 sub GetName {
     my ( $self, $categorycode ) = @_;
 
-    my $schema = Koha::Database->new->schema;
-    return $schema->resultset( 'Category' )->search( {
-        categorycode => $categorycode,
-    } )->get_column( 'description' )->next // '';
+    return Koha::Patron::Categories->find( $categorycode )->description;
 }
 
 sub all {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index a3d152be49..a2d03156a3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -128,10 +128,10 @@
                                     Library card number:
                                     </label>
                                     [% IF borrower %]
+                                        [% borrower.cardnumber %]
+                                    [% ELSE %]
                                         <input type="text" id="borrower_cardnumber" name="borrower_cardnumber" value="[% borrower.cardnumber %]" />
                                         [% IF mandatory.defined('cardnumber') %]<span class="required">Required</span>[% END %]
-                                    [% ELSE %]
-                                        [% borrower.cardnumber %]
                                     [% END %]
                                 </li>
                                 [% END %]
@@ -170,6 +170,8 @@
                                         Category:</label>
 
                                         [% IF borrower %]
+                                            [% Categories.GetName( borrower.categorycode ) %]
+                                        [% ELSE %]
                                             <select id="borrower_categorycode" name="borrower_categorycode">
                                                 [% FOREACH c IN Categories.all() %]
                                                     [% IF c.categorycode == Koha.Preference('PatronSelfRegistrationDefaultCategory') %]
@@ -179,8 +181,6 @@
                                                     [% END %]
                                                 [% END %]
                                             </select>
-                                        [% ELSE %]
-                                            [% Categories.GetName( borrower.categorycode ) %]
                                         [% END %]
                                     </li>
                                 [% END %]