diff --git a/insertdata.pl b/insertdata.pl
index fcc873ccd9..a14578be2f 100755
--- a/insertdata.pl
+++ b/insertdata.pl
@@ -58,7 +58,7 @@
   altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
   categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
   borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-  initials='$data{'initials'}',physstreet='$data{'address'}',ethnicity='$data{'ethnicity'}',
+  initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
   gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',textmessaging='$data{'textmessaging'}'
   where borrowernumber=$data{'borrowernumber'}";
 #  print $query;
@@ -71,13 +71,13 @@
   $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
   firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
   altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-  initials,ethnicity,borrowernumber) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
+  initials,ethnicity,borrowernumber,physstreet) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
   '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
   '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
   '$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
   '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
   '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
-  '$data{'ethnicity'}','$data{'borrowernumber'}')";
+  '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}')";
 }
 # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
 # so when we update information for an adult we should check for guarantees and update the relevant part
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 3d2667c539..592764e19a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -82,7 +82,7 @@
     </tr>
 
     <tr valign=top bgcolor=white>
-      <td COLSPAN=3><input type=text name=address size=40 value="<TMPL_VAR NAME=streetaddress>"></td>
+      <td COLSPAN=3><input type=text name=address size=40 value="<TMPL_VAR NAME=address>"></td>
       <td><input type=text name=city size=20 value="<TMPL_VAR NAME=city>"></td>
       <td>
         <SELECT NAME="area" SIZE="1">
diff --git a/memberentry.pl b/memberentry.pl
index a8f029e981..725a842b65 100755
--- a/memberentry.pl
+++ b/memberentry.pl
@@ -182,13 +182,14 @@
 
   $template->param( 
   			member          => $member,
+			address         => $data->{'streetaddress'},
   			firstname       => $data->{'firstname'},
   			surname         => $data->{'surname'},
   			othernames	=> $data->{'othernames'},
   			initials	=> $data->{'initials'},
   			ethcatpopup	=> $ethcatpopup,
   			catcodepopup	=> $catcodepopup,
-  			streetaddress   => $data->{'streetaddress'},
+  			streetaddress   => $data->{'physstreet'},
   			streetcity      => $data->{'streetcity'},
 			city		=> $data->{'city'},
   			phone           => $data->{'phone'},