diff --git a/members/memberentry.pl b/members/memberentry.pl
index 6b39df2996..5f15a10555 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -550,7 +550,9 @@ if ( ( !$nok ) and $nodouble and ( $op eq 'cud-insert' or $op eq 'cud-save' ) )
         $patron = Koha::Patrons->find($borrowernumber);
 
         # Ensure preferred name is set even if not passed because of BorrowerUnwantedFields
-        $newdata{preferred_name} = undef unless defined $newdata{preferred_name};
+        if ( $step == 0 or $step == 1 ) {
+            $newdata{preferred_name} = undef unless defined $newdata{preferred_name};
+        }
 
         if ($NoUpdateEmail) {
             delete $newdata{'email'};