diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 2c1a1b7993..65251c5b0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -2043,7 +2043,7 @@ legend.collapsed i.fa.fa-caret-down::before {
                             });
                            new_field.appendTo("#quick_add_list");
                        } else {
-                           let orig_input_id = orig_li.children("input,textarea,select").attr("id");
+                           let orig_input_id = orig_li.children("input,textarea,select").last().attr("id");
                            if ( orig_input_id ) {
                                let new_field = orig_li.clone();
                                new_field.children("#"+orig_input_id).attr("id",orig_input_id + "_quick_add");
diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
index c1042825ce..a4b8b91bc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
@@ -225,10 +225,10 @@ $(document).ready(function(){
         var addressfield = $(this).data("addressfield");
         var myRegEx=new RegExp(/(.*)\|(.*)\|(.*)\|(.*)/);
         var matches = selected_city.match( myRegEx );
-        $("#" + addressfield + "zipcode").val( matches[1] );
-        $("#" + addressfield + "city").val( matches[2] );
-        $("#" + addressfield + "state").val( matches[3] );
-        $("#" + addressfield + "country").val( matches[4] );
+        $("#" + addressfield + "zipcode,#" + addressfield + "zipcode_quick_add").val( matches[1] );
+        $("#" + addressfield + "city,#" + addressfield + "city_quick_add").val( matches[2] );
+        $("#" + addressfield + "state,#" + addressfield + "state_quick_add").val( matches[3] );
+        $("#" + addressfield + "country,#" + addressfield + "country_quick_add").val( matches[4] );
     });
 
     dateformat = $("#dateofbirth").siblings(".hint").first().html();