diff --git a/resources/views/components/contacts/form/general.blade.php b/resources/views/components/contacts/form/general.blade.php
index 494b7f074..a31c79cde 100644
--- a/resources/views/components/contacts/form/general.blade.php
+++ b/resources/views/components/contacts/form/general.blade.php
@@ -11,62 +11,63 @@
             <x-form.group.text name="name" label="{{ trans($textName) }}" form-group-class="{{ $classNameFromGroupClass }}" />
         @endif
 
-        <div class="sm:col-span-3 grid gap-x-8 gap-y-6">
-            @if (! $hideEmail)
-                <x-form.group.text name="email" label="{{ trans($textEmail) }}" not-required />
-            @endif
+        <div class="sm:col-span-3">
+            <div class="relative sm:col-span-6 grid gap-x-8 gap-y-6">
+                @if (! $hideEmail)
+                    <x-form.group.text name="email" label="{{ trans($textEmail) }}" form-group-class="sm:col-span-6" not-required />
+                @endif
 
-            @if (! $hidePhone)
-                <x-form.group.text name="phone" label="{{ trans($textPhone) }}" not-required />
-            @endif
+                @if (! $hidePhone)
+                    <x-form.group.text name="phone" label="{{ trans($textPhone) }}" form-group-class="sm:col-span-6" not-required />
+                @endif
 
-            @if (! $hideWebsite)
-                <x-form.group.text name="website" label="{{ trans($textWebsite) }}" not-required />
-            @endif
+                @if (! $hideWebsite)
+                    <x-form.group.text name="website" label="{{ trans($textWebsite) }}" form-group-class="sm:col-span-6" not-required />
+                @endif
 
-            @if (! $hideReference)
-                <x-form.group.text name="reference" label="{{ trans($textReference) }}" not-required />
-            @endif
+                @if (! $hideReference)
+                    <x-form.group.text name="reference" label="{{ trans($textReference) }}" form-group-class="sm:col-span-6" not-required />
+                @endif
+            </div>
         </div>
 
         <div class="sm:col-span-3">
-            @if (! $hideCanLogin)
-                <div class="mt-9">
-                    @if (empty($contact))
-                        <x-tooltip id="tooltip-client_portal-text" placement="bottom" message="{{ trans('customers.can_login_description') }}">
-                            <x-form.group.checkbox
-                                name="create_user"
-                                :options="['1' => trans('customers.can_login')]"
-                                @input="onCanLogin($event)"
-                                checkbox-class="sm:col-span-6"
-                            />
-                        </x-tooltip>
-                    @else
-                        @if ($contact->user_id)
-                            <x-form.group.checkbox
-                                name="create_user"
-                                :options="['1' => trans('customers.user_created')]"
-                                checkbox-class="sm:col-span-6"
-                                checked
-                                disabled
-                            />
-                        @else
+            <div class="relative sm:col-span-6 grid gap-x-8 gap-y-6">
+                @if (! $hideCanLogin)
+                    <div class="sm:col-span-6 mt-9 mb-2">
+                        @if (empty($contact))
                             <x-tooltip id="tooltip-client_portal-text" placement="bottom" message="{{ trans('customers.can_login_description') }}">
                                 <x-form.group.checkbox
                                     name="create_user"
                                     :options="['1' => trans('customers.can_login')]"
-                                    checkbox-class="sm:col-span-6"
                                     @input="onCanLogin($event)"
                                 />
                             </x-tooltip>
+                        @else
+                            @if ($contact->user_id)
+                                <x-form.group.checkbox
+                                    name="create_user"
+                                    :options="['1' => trans('customers.user_created')]"
+                                    checked
+                                    disabled
+                                />
+                            @else
+                                <x-tooltip id="tooltip-client_portal-text" placement="bottom" message="{{ trans('customers.can_login_description') }}">
+                                    <x-form.group.checkbox
+                                        name="create_user"
+                                        :options="['1' => trans('customers.can_login')]"
+                                        @input="onCanLogin($event)"
+                                    />
+                                </x-tooltip>
+                            @endif
                         @endif
-                    @endif
-                </div>
-            @endif
+                    </div>
+                @endif
 
-            @if (! $hideLogo)
-                <x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" :value="! empty($contact) ? $contact->logo : false" not-required />
-            @endif
+                @if (! $hideLogo)
+                    <x-form.group.file name="logo" label="{{ trans_choice('general.pictures', 1) }}" :value="! empty($contact) ? $contact->logo : false" form-group-class="sm:col-span-6" not-required />
+                @endif
+            </div>
         </div>
     </x-slot>
 </x-form.section>