diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
index 3bf92462153..b83998b28c1 100644
--- a/backend/app/assets/javascripts/spree/backend.js
+++ b/backend/app/assets/javascripts/spree/backend.js
@@ -22,6 +22,7 @@
 //= require spree/backend/collections
 //= require spree/backend/views
 //
+//= require spree/backend/addresses
 //= require spree/backend/adjustments
 //= require spree/backend/admin
 //= require spree/backend/calculator
@@ -52,7 +53,6 @@
 //= require spree/backend/routes
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
-//= require spree/backend/stock_location
 //= require spree/backend/stock_management
 //= require spree/backend/store_credits
 //= require spree/backend/style_guide
diff --git a/backend/app/assets/javascripts/spree/backend/stock_location.js b/backend/app/assets/javascripts/spree/backend/addresses.js
similarity index 85%
rename from backend/app/assets/javascripts/spree/backend/stock_location.js
rename to backend/app/assets/javascripts/spree/backend/addresses.js
index d229f5dcbb9..fb9dc81654c 100644
--- a/backend/app/assets/javascripts/spree/backend/stock_location.js
+++ b/backend/app/assets/javascripts/spree/backend/addresses.js
@@ -3,7 +3,7 @@
 Spree.ready(function() {
   "use strict";
 
-  _.each(document.querySelectorAll('.js-stock-locations-form'), function(el) {
+  _.each(document.querySelectorAll('.js-addresses-form'), function(el) {
     var countrySelect = el.querySelector('.js-country_id');
     var model = new Backbone.Model({
       country_id: countrySelect.value
diff --git a/backend/app/views/spree/admin/stock_locations/_form.html.erb b/backend/app/views/spree/admin/stock_locations/_form.html.erb
index d79fc166afc..8774d6ee010 100644
--- a/backend/app/views/spree/admin/stock_locations/_form.html.erb
+++ b/backend/app/views/spree/admin/stock_locations/_form.html.erb
@@ -1,4 +1,4 @@
-<div data-hook="admin_stock_locations_form_fields" class="js-stock-locations-form">
+<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form">
   <fieldset class="no-border-bottom">
     <legend><%= t('.general') %></legend>
 
diff --git a/backend/app/views/spree/admin/users/_addresses_form.html.erb b/backend/app/views/spree/admin/users/_addresses_form.html.erb
index 20f06b0e033..7644af1dd14 100644
--- a/backend/app/views/spree/admin/users/_addresses_form.html.erb
+++ b/backend/app/views/spree/admin/users/_addresses_form.html.erb
@@ -1,6 +1,6 @@
 <div class="row">
-    
-  <div data-hook="bill_address_wrapper" class="col-6">
+
+  <div data-hook="bill_address_wrapper" class="col-6 js-addresses-form">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= t('spree.billing_address') %></legend>
       <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
@@ -9,7 +9,7 @@
     </fieldset>
   </div>
 
-  <div data-hook="ship_address_wrapper" class="col-6">
+  <div data-hook="ship_address_wrapper" class="col-6 js-addresses-form">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= t('spree.shipping_address') %></legend>
       <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>