diff --git a/src/app/form/footer-form/footer-form.component.html b/src/app/form/footer-form/footer-form.component.html
index c2e91330f1f7027b9dae082ecf2c2467f458b45d..a2d4f21ff57b20eb0bfb39750e17cda3c6b32263 100644
--- a/src/app/form/footer-form/footer-form.component.html
+++ b/src/app/form/footer-form/footer-form.component.html
@@ -11,6 +11,7 @@
     class="btn-primary small next"
     (click)="goToNextPage()"
     [disabled]="!isValid"
+    type="submit"
     [ngClass]="{ invalid: !isValid }"
   >
     <div class="rowBtn" fxLayout="row" fxLayoutAlign="center center">
diff --git a/src/app/form/footer-form/footer-form.component.scss b/src/app/form/footer-form/footer-form.component.scss
index 31dbd2f3b7af39cd086d322c272212887e705cac..6ebf95c44d942324b2dd9b9465419bbed1d9d809 100644
--- a/src/app/form/footer-form/footer-form.component.scss
+++ b/src/app/form/footer-form/footer-form.component.scss
@@ -25,6 +25,6 @@
 .chevronRight {
   height: 24px;
   width: 24px;
-  stroke: $white;
+  stroke: inherit;
   margin-left: 10px;
 }
diff --git a/src/app/form/form.component.html b/src/app/form/form.component.html
index cff7297157f2d617e8287b3d64eb0e40117d39fa..5f5583778de275c811224da2443f65dd27019c0e 100644
--- a/src/app/form/form.component.html
+++ b/src/app/form/form.component.html
@@ -105,7 +105,7 @@
         </ul>
       </div>
     </div>
-    <form [formGroup]="accountForm" *ngIf="accountForm && !profile">
+    <form [formGroup]="accountForm" *ngIf="accountForm && !profile" (keyup.enter)="isPageValid && !isEditMode? nextPage() : null">
       <div *ngIf="currentPage == pageTypeEnum.accountInfo" class="page">
         <div class="title">
           <h3>Qui êtes-vous ?</h3>
@@ -274,7 +274,7 @@
         </div>
       </div>
     </form>
-    <form [formGroup]="structureForm" *ngIf="structureForm">
+    <form [formGroup]="structureForm" *ngIf="structureForm" (keyup.enter)="isPageValid && !isEditMode? nextPage() : null">
       <div *ngIf="currentPage == pageTypeEnum.structureNameAndAddress" class="page">
         <div class="title">
           <h3>Quelle structure voulez-vous réferencer ?</h3>
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.html b/src/app/shared/components/signup-modal/signup-modal.component.html
index 91900cf36312f7a593f372e86e14eb75217f1e3d..492b39e291a3d34c23112fa94fe5830c2cd964ff 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.html
+++ b/src/app/shared/components/signup-modal/signup-modal.component.html
@@ -39,13 +39,13 @@
                 <use [attr.xlink:href]="'assets/form/sprite.svg#notValidate'"></use>
               </svg>
             </div>
-            <div class="invalid" *ngIf="authFailed">Identifiant ou mot de passe invalide</div>
+            <div class="incorrectId" *ngIf="authFailed">Identifiant ou mot de passe invalide</div>
           </div>
           <div class="footerModal" fxLayout="row" fxLayoutAlign="space-around center">
-            <button class="btn confirm" (click)="swithToResetPassword()">Mot de passe oublié</button>
+            <button type="button" class="btn confirm" (click)="swithToResetPassword()">Mot de passe oublié</button>
             <button
               type="submit"
-              class="btn"
+              class="btn-primary"
               [disabled]="loginForm.invalid || loading"
               [ngClass]="{ invalid: loginForm.invalid || loading }"
             >
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.scss b/src/app/shared/components/signup-modal/signup-modal.component.scss
index 2133bd8f4c529f1d06136da9462d7588b900d632..ecf2f6b5648c36b232fd34a7f2c18b08cf31c1e0 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.scss
+++ b/src/app/shared/components/signup-modal/signup-modal.component.scss
@@ -7,9 +7,11 @@
 .ico-close {
   width: 100%;
 }
-.invalid {
+
+.incorrectId {
   color: $orange-warning;
 }
+
 h3 {
   @include cn-bold-26;
   color: $black;
diff --git a/src/assets/scss/_buttons.scss b/src/assets/scss/_buttons.scss
index 3827c75d7ab29535359c501c9248b833539852fb..e17ec875cd592b90d0a853044e9e0c36a1e6224e 100644
--- a/src/assets/scss/_buttons.scss
+++ b/src/assets/scss/_buttons.scss
@@ -73,10 +73,17 @@
   height: 40px;
   width: 192px;
   @include btn-bold;
+  stroke: $white;
   &.small {
     width: 149px;
   }
   &.invalid {
     opacity: 0.4;
   }
+  &:focus {
+    background: $white;
+    color: $secondary-color;
+    border: 1px solid $secondary-color;
+    stroke: $secondary-color;
+  }
 }