diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
index df4332dcba..be4d08fd14 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
@@ -34,10 +34,23 @@
 
                         <p>You have successfully registered your new account. To log in, use the following credentials:</p>
 
-                        <p>Username: [% borrower.userid %]</p>
-                        <p>Password: [% password_cleartext %]</p>
+                        <p id="patron-userid-p">
+                            <span id="patron-userid-label">Username:</span>
+                            <span id="patron-userid">[% borrower.userid %]</span>
+                        </p>
+                        <p id="patron-password-p">
+                            <span id="patron-password-label">Password:</span>
+                            <span id="patron-password">[% password_cleartext %]<span>
+                        </p>
 
-                        <p>For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p>
+                        [% IF borrower.cardnumber %]
+                            <p id="patron-cardnumber-p">
+                                <span id="patron-cardnumber-label">Card number:</span>
+                                <span id="patron-cardnumber">[% borrower.cardnumber %]</span>
+                            </p>
+                        [% END %]
+
+                        <p id="patron-instructions">For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p>
 
                         <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions %]</div>
                     </div>