diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index cc16c6e22..b5711873c 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -9,33 +9,26 @@
       </ds-space>
     </ds-card>
     <ds-card v-else class="create-account-card">
-      <ds-flex gutter="small">
-        <ds-flex-item width="100%">
-          <client-only>
-            <locale-switch />
-          </client-only>
-          <ds-space centered>
-            <img
-              class="create-account-image"
-              alt="Create an account for Human Connection"
-              src="/img/sign-up/nicetomeetyou.svg"
-            />
-          </ds-space>
-        </ds-flex-item>
-        <ds-flex-item width="100%">
-          <ds-space>
-            <ds-heading size="h3">
-              {{ $t('registration.create-user-account.title') }}
-            </ds-heading>
-          </ds-space>
+      <client-only>
+        <locale-switch />
+      </client-only>
+      <ds-space centered>
+        <img
+          class="create-account-image"
+          alt="Create an account for Human Connection"
+          src="/img/sign-up/nicetomeetyou.svg"
+        />
+      </ds-space>
+      <ds-space>
+        <ds-heading size="h3">
+          {{ $t('registration.create-user-account.title') }}
+        </ds-heading>
+      </ds-space>
 
-          <ds-form
-            class="create-user-account"
-            v-model="formData"
-            :schema="formSchema"
-            @submit="submit"
-          >
-            <template slot-scope="{ errors }">
+      <ds-form class="create-user-account" v-model="formData" :schema="formSchema" @submit="submit">
+        <template v-slot="{ errors }">
+          <ds-flex gutter="base">
+            <ds-flex-item width="100%">
               <ds-input
                 id="name"
                 model="name"
@@ -79,26 +72,25 @@
                   v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
                 ></label>
               </ds-text>
-
-              <template slot="footer">
-                <ds-space class="backendErrors" v-if="backendErrors">
-                  <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
-                </ds-space>
-                <ds-button
-                  style="float: right;"
-                  icon="check"
-                  type="submit"
-                  :loading="$apollo.loading"
-                  :disabled="errors || !termsAndConditionsConfirmed"
-                  primary
-                >
-                  {{ $t('actions.save') }}
-                </ds-button>
-              </template>
-            </template>
-          </ds-form>
-        </ds-flex-item>
-      </ds-flex>
+            </ds-flex-item>
+            <ds-flex-item width="100%">
+              <ds-space class="backendErrors" v-if="backendErrors">
+                <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
+              </ds-space>
+              <ds-button
+                style="float: right;"
+                icon="check"
+                type="submit"
+                :loading="$apollo.loading"
+                :disabled="errors || !termsAndConditionsConfirmed"
+                primary
+              >
+                {{ $t('actions.save') }}
+              </ds-button>
+            </ds-flex-item>
+          </ds-flex>
+        </template>
+      </ds-form>
     </ds-card>
   </ds-container>
 </template>