diff --git a/tailbone/views/people.py b/tailbone/views/people.py
index 1993c2e3..6d517e3a 100644
--- a/tailbone/views/people.py
+++ b/tailbone/views/people.py
@@ -859,16 +859,8 @@ class PersonView(MasterView):
         data = dict(self.request.json_body)
 
         # update person address
-        address = person.address
-        if not address:
-            address = person.add_address()
-        address.street = data['street']
-        address.street2 = data['street2']
-        address.city = data['city']
-        address.state = data['state']
-        address.zipcode = data['zipcode']
-
-        self.handler.mark_address_invalid(person, address, data['invalid'])
+        address = self.people_handler.ensure_address(person)
+        self.people_handler.update_address(person, address, **data)
 
         self.Session.flush()
         return {