diff --git a/src/main/resources/templates/customer/customerform.html b/src/main/resources/templates/customer/customerform.html
index c3b6fe1a..90314f7b 100644
--- a/src/main/resources/templates/customer/customerform.html
+++ b/src/main/resources/templates/customer/customerform.html
@@ -48,31 +48,31 @@ <h2>Customer Details</h2>
             <div class="form-group">
                 <label class="col-sm-2 control-label">Address Line 1:</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" th:field="*{addressLine1}"/>
+                    <input type="text" class="form-control" th:field="*{billingAddress.addressLine1}"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">Address Line 2:</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" th:field="*{addressLine2}"/>
+                    <input type="text" class="form-control" th:field="*{billingAddress.addressLine2}"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">City:</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" th:field="*{city}"/>
+                    <input type="text" class="form-control" th:field="*{billingAddress.city}"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">State:</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" th:field="*{state}"/>
+                    <input type="text" class="form-control" th:field="*{billingAddress.state}"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">Zip Code:</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" th:field="*{zipCode}"/>
+                    <input type="text" class="form-control" th:field="*{billingAddress.zipCode}"/>
                 </div>
             </div>
             <div class="row">
diff --git a/src/main/resources/templates/customer/show.html b/src/main/resources/templates/customer/show.html
index 5dadfa44..1d9ab89a 100644
--- a/src/main/resources/templates/customer/show.html
+++ b/src/main/resources/templates/customer/show.html
@@ -58,31 +58,31 @@ <h2>Show Customer</h2>
                 <div class="form-group">
                     <label class="col-sm-2 sm-2 control-label">Address Line 1:</label>
                     <div class="col-sm-10">
-                        <p class="form-control-static" th:text="${customer.addressLine1}">Address Line 1</p>
+                        <p class="form-control-static" th:text="${customer.billingAddress.addressLine1}">Address Line 1</p>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 sm-2 control-label">Address Line 2:</label>
                     <div class="col-sm-10">
-                        <p class="form-control-static" th:text="${customer.addressLine2}">Address Line 2</p>
+                        <p class="form-control-static" th:text="${customer.billingAddress.addressLine2}">Address Line 2</p>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 sm-2 control-label">City:</label>
                     <div class="col-sm-10">
-                        <p class="form-control-static" th:text="${customer.city}">City</p>
+                        <p class="form-control-static" th:text="${customer.billingAddress.city}">City</p>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 sm-2 control-label">State:</label>
                     <div class="col-sm-10">
-                        <p class="form-control-static" th:text="${customer.state}">State</p>
+                        <p class="form-control-static" th:text="${customer.billingAddress.state}">State</p>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-2 sm-2 control-label">Zip Code:</label>
                     <div class="col-sm-10">
-                        <p class="form-control-static" th:text="${customer.zipCode}">Zipcode</p>
+                        <p class="form-control-static" th:text="${customer.billingAddress.zipCode}">Zipcode</p>
                     </div>
                 </div>
             </form>