diff --git a/c3l_membership/views.py b/c3l_membership/views.py
--- a/c3l_membership/views.py
+++ b/c3l_membership/views.py
@@ -97,16 +97,19 @@ def index():
             else date(9999, 12, 12),
             "username": form.username.data,
             "email": form.email.data,
-            "address": " ".join(
-                (
-                    form.street.data,
-                    form.zip.data,
-                    form.city.data,
-                    form.state.data,
-                    form.country.data,
-                )
+            "address": re.sub(
+                "\s+",
+                " ",
+                " ".join(
+                    (
+                        form.street.data,
+                        form.zip.data,
+                        form.city.data,
+                        form.state.data,
+                        form.country.data,
+                    )
+                ),
             ),
-            "address": re.sub("\s+", " ", xml_data["address"]),
             "voting": 1 if form.membership.data == "regular" else 0,
             "date": now,
         }