diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index b1d9b14620..bde22cdd5a 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -193,6 +193,10 @@ sub store {
 
             $self->trim_whitespaces;
 
+            # Set surname to uppercase if uppercasesurname is true
+        $self->surname( uc($self->surname) )
+        if C4::Context->preference("uppercasesurname");
+
             unless ( $self->in_storage ) {    #AddMember
 
                 # Generate a valid userid/login if needed
diff --git a/members/memberentry.pl b/members/memberentry.pl
index bd86e36b67..18f3a96466 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -343,10 +343,6 @@ if ($op eq 'save' || $op eq 'insert'){
         }
     }
   
-    if($newdata{surname} && C4::Context->preference('uppercasesurnames')) {
-        $newdata{'surname'} = uc($newdata{'surname'});
-    }
-
   if (C4::Context->preference("IndependentBranches")) {
     unless ( C4::Context->IsSuperLibrarian() ){
       $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};