diff --git a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
index f867abef4..97d807682 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
@@ -17,6 +17,7 @@
           :label="$t('field.emailAddress')"
           required
           :error="fieldHasErrors('email') || loginRequestError"
+          class="margin-bottom-2"
         >
           <FormInput
             ref="email"
diff --git a/web-frontend/modules/core/components/settings/AccountForm.vue b/web-frontend/modules/core/components/settings/AccountForm.vue
index 03d558d06..fdb80b560 100644
--- a/web-frontend/modules/core/components/settings/AccountForm.vue
+++ b/web-frontend/modules/core/components/settings/AccountForm.vue
@@ -11,6 +11,7 @@
         ref="first_name"
         v-model="values.first_name"
         size="large"
+        :error="fieldHasErrors('first_name')"
         @blur="$v.values.first_name.$touch()"
       ></FormInput>
 
diff --git a/web-frontend/modules/database/components/table/TableForm.vue b/web-frontend/modules/database/components/table/TableForm.vue
index b0729d2a7..469e6b4d6 100644
--- a/web-frontend/modules/database/components/table/TableForm.vue
+++ b/web-frontend/modules/database/components/table/TableForm.vue
@@ -5,6 +5,7 @@
       :error="fieldHasErrors('name')"
       required
       small-label
+      class="margin-bottom-2"
     >
       <template #label>
         <i class="iconoir-text"></i> {{ $t('tableForm.name') }}</template
@@ -15,14 +16,13 @@
         size="large"
         :error="fieldHasErrors('name')"
         :disabled="!creation"
-        class="margin-bottom-2"
         @focus.once="$event.target.select()"
         @blur="$v.values.name.$touch()"
       >
-        <template #error>
-          {{ $t('error.requiredField') }}
-        </template>
       </FormInput>
+      <template #error>
+        {{ $t('error.requiredField') }}
+      </template>
     </FormGroup>
     <slot></slot>
   </form>
diff --git a/web-frontend/modules/database/components/table/TableJSONImporter.vue b/web-frontend/modules/database/components/table/TableJSONImporter.vue
index 75d20c90e..ba4c5d940 100644
--- a/web-frontend/modules/database/components/table/TableJSONImporter.vue
+++ b/web-frontend/modules/database/components/table/TableJSONImporter.vue
@@ -63,8 +63,8 @@
         </div>
       </div>
     </div>
-    <div v-if="filename !== ''" class="control">
-      <label class="control__label">{{
+    <div v-if="filename !== ''" class="control margin-top-2">
+      <label class="control__label control__label--small">{{
         $t('tableJSONImporter.encodingLabel')
       }}</label>
       <div class="control__elements">