diff --git a/plugins/login-resources/src/components/Form.svelte b/plugins/login-resources/src/components/Form.svelte
index 8c1f053036..fa556c519d 100644
--- a/plugins/login-resources/src/components/Form.svelte
+++ b/plugins/login-resources/src/components/Form.svelte
@@ -176,9 +176,6 @@
     {/if}
     <div class="title"><Label label={caption} /></div>
   {/if}
-  <div class="status">
-    <StatusControl {status} />
-  </div>
   <div class="form">
     {#each fields as field (field.name)}
       <div class={field.short && !($deviceInfo.docWidth <= 600) ? 'form-col' : 'form-row'}>
@@ -195,6 +192,10 @@
       </div>
     {/each}
 
+    <div class="status">
+      <StatusControl {status} />
+    </div>
+
     <div class="form-row send">
       <Button
         label={action.i18n}
@@ -276,9 +277,9 @@
       }
     }
     .status {
-      min-height: 7.5rem;
-      max-height: 7.5rem;
-      padding-top: 1.25rem;
+      padding-top: 1rem;
+      grid-column-start: 1;
+      grid-column-end: 3;
     }
 
     .form {
@@ -286,6 +287,7 @@
       grid-template-columns: 1fr 1fr;
       column-gap: 0.75rem;
       row-gap: 1.5rem;
+      margin-top: 1.5rem;
 
       .form-row {
         grid-column-start: 1;
@@ -299,7 +301,7 @@
       }
 
       .send {
-        margin-top: 2.25rem;
+        margin-top: 0rem;
       }
     }
     .grow-separator {