diff --git a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
index 9a0297abf..300eae352 100644
--- a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
+++ b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
@@ -65,7 +65,8 @@ const CreatePageForForm = (FormComponent) => {
       if (event.target.type === 'checkbox') {
         changes[event.target.id] = event.target.checked;
       } else {
-        changes[event.target.id] = event.target.value;
+        const {value = ''} = event.target
+        changes[event.target.id] = value.trim();
       }
 
       const accountInfo = Object.assign({}, this.state.accountInfo, changes);