diff --git a/packages/composables/src/composables/useBilling/index.ts b/packages/composables/src/composables/useBilling/index.ts
index e25573ec2..c1824a117 100644
--- a/packages/composables/src/composables/useBilling/index.ts
+++ b/packages/composables/src/composables/useBilling/index.ts
@@ -49,7 +49,7 @@ const factoryParams: UseBillingParams<any, any> = {
       : ({
         address: {
           ...address,
-          street: [address.street, apartment, neighborhood, extra],
+          street: [address.street, apartment, neighborhood, extra].filter(Boolean),
         },
         same_as_shipping: sameAsShipping,
       });
diff --git a/packages/composables/src/composables/useShipping/index.ts b/packages/composables/src/composables/useShipping/index.ts
index b62bba25e..dbbc1ba92 100644
--- a/packages/composables/src/composables/useShipping/index.ts
+++ b/packages/composables/src/composables/useShipping/index.ts
@@ -49,7 +49,7 @@ const factoryParams: UseShippingParams<any, any> = {
       : ({
         address: {
           ...address,
-          street: [address.street, apartment, neighborhood, extra],
+          street: [address.street, apartment, neighborhood, extra].filter(Boolean),
         },
       });
 
diff --git a/packages/theme/pages/Checkout/UserAccount.vue b/packages/theme/pages/Checkout/UserAccount.vue
index 4c15942a8..6983ad970 100644
--- a/packages/theme/pages/Checkout/UserAccount.vue
+++ b/packages/theme/pages/Checkout/UserAccount.vue
@@ -218,7 +218,7 @@ export default defineComponent({
       if (!isAuthenticated.value) {
         await (
           !createUserAccount.value
-            ? attachToCart({ user: form.value })
+            ? attachToCart({ email: form.value.email })
             : register({ user: form.value })
         );
       }
diff --git a/packages/theme/pages/Checkout/__tests__/UserAccount.spec.js b/packages/theme/pages/Checkout/__tests__/UserAccount.spec.js
index e87f48093..014f84ba6 100644
--- a/packages/theme/pages/Checkout/__tests__/UserAccount.spec.js
+++ b/packages/theme/pages/Checkout/__tests__/UserAccount.spec.js
@@ -94,13 +94,7 @@ describe('<UserAccount/>', () => {
     await waitFor(() => {
       expect(attachToCartMock).toHaveBeenCalledTimes(1);
       expect(attachToCartMock).toHaveBeenCalledWith({
-        user: {
-          email: 'james@bond.io',
-          firstname: 'James',
-          lastname: 'Bond',
-          password: '',
-          is_subscribed: false,
-        },
+        email: 'james@bond.io',
       });
     });
     expect(routerPushMock).toHaveBeenCalledTimes(1);