diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index 86061f6fcac99f113d217ecefe0bba3fff1f81ce..b670f762fb31e0e809b67eb7f1d557f6348edb46 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -1,8 +1,6 @@
 <app-form-page>
   <h1>Connexion</h1>
 
-  <messages></messages>
-
   <form [formGroup]="formGroup" (ngSubmit)="login()">
 
     <!-- Email field -->
@@ -17,11 +15,15 @@
 
     <!-- Submit -->
     <div class="text-center">
-      <button mat-raised-button color="primary" [disabled]="!formGroup.valid || loading" id="login-btn">Se connecter</button>
-      <p *ngIf="loading"><i class="fa fa-spinner fa-pulse"></i></p>
+      <button mat-raised-button color="primary" [disabled]="!formGroup.valid || loading" id="login-btn">
+        Se connecter <i *ngIf="loading" class="fa fa-spinner fa-pulse"></i>
+      </button>
     </div>
+
   </form>
 
+  <messages></messages>
+
   <p class="text-center">
     Ou crée ton
     <a routerLink="/inscription">compte tutoré</a>
diff --git a/src/app/shared/form-page/form-page.component.scss b/src/app/shared/form-page/form-page.component.scss
index 9ab47b5137d583eb963fcd69c43f170ffd850e54..9b87fb5a587d6d806d3d944de7c4430efdfd5669 100644
--- a/src/app/shared/form-page/form-page.component.scss
+++ b/src/app/shared/form-page/form-page.component.scss
@@ -17,7 +17,10 @@
   background: white;
   border: 1px solid lightgray;
   border-radius: 8px;
-  padding: 2em 3em;
+  padding: 1em;
+  @include media-xs {
+    padding: 2em 3em;
+  }
   box-sizing: border-box;
 }