diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index ffcb4cb5d4..96995aba54 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -962,10 +962,11 @@ tables:
             - "Your new Koha account details are:"
             - ""
             - "User:  <<borrowers.userid>>"
-            - "Password: <<borrowers.password>>"
             - ""
             - "If you have any problems or questions regarding your account, please contact your Koha Administrator."
             - ""
+            - "If you do not have your account password, please contact your Koha Administrator."
+            - ""
             - "Thank you,"
             - "Koha Administrator"
             - "kohaadmin@yoursite.org"
diff --git a/members/memberentry.pl b/members/memberentry.pl
index a21e631823..efb0d4283b 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -456,6 +456,7 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
             add_guarantors( $patron, $input );
             $borrowernumber = $patron->borrowernumber;
             $newdata{'borrowernumber'} = $borrowernumber;
+            delete $newdata{password};
         }
 
         # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.