diff --git a/lang/fr.json b/lang/fr.json
index bbedf423c9c758e717e70ec785a57963515b8789..0dadfb69d000afff2a0ad9ef7db1eb7d1baf8dca 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -497,6 +497,7 @@
 		"connectorUpdated": "Connecteur modifié",
 		"connectorDeleted": "Connecteur supprimé",
 		"smsContent": "Contenu du SMS envoyé",
-		"emailContent": "Contenu du courriel envoyé"
+		"emailContent": "Contenu de la notification à envoyer par courriel",
+		"emailSubject": "Sujet"
 	}
 }
diff --git a/src/frontend/app/administration/otp/otp.component.html b/src/frontend/app/administration/otp/otp.component.html
index 4903668e0c53e7f539bc40bc9f065915c57f376f..535cab81ff542ec3fc88f8b049bc0c80c5eeea47 100644
--- a/src/frontend/app/administration/otp/otp.component.html
+++ b/src/frontend/app/administration/otp/otp.component.html
@@ -60,12 +60,17 @@
                 </ion-label>
             </ion-list-header>
             <ion-item>
-                <ion-textarea name ="smsContent"rows="2" cols="10" [(ngModel)]="connector.message.sms" 
+                <ion-textarea name ="smsContent"rows="2" cols="10" [maxlength]="150" [(ngModel)]="connector.message.otp_sms" 
                     [required]="connector.securityModes.includes('sms')" placeholder="Ex: Bonjour Alain Dupont, le code de sécurité est ...">
                 </ion-textarea>
             </ion-item>
         </ion-list>
         <ion-list *ngIf="connector.securityModes.includes('email')">
+            <ion-item>
+                <ion-label color="secondary" position="floating">{{ 'lang.emailSubject' | translate}} *</ion-label>
+                <ion-input name="subject" [(ngModel)]="connector.message.notification.subject" required>
+                </ion-input>
+            </ion-item>
             <ion-list-header>
                 <ion-label color="secondary">
                     {{ 'lang.emailContent' | translate}} <ng-container
@@ -73,7 +78,7 @@
                 </ion-label>
             </ion-list-header>
             <ion-item>
-                <ion-textarea name="emailContent" rows="2" cols="10" [(ngModel)]="connector.message.email"
+                <ion-textarea name="emailContent" rows="2" cols="10" [(ngModel)]="connector.message.notification.body"
                     [required]="connector.securityModes.includes('email')" placeholder="Ex: Bonjour Alain Dupont, le code de sécurité est ...">
                 </ion-textarea>
             </ion-item>
diff --git a/src/frontend/app/administration/otp/otp.component.ts b/src/frontend/app/administration/otp/otp.component.ts
index 02683519e967b7e310146ac553e0e64c13330b0c..f6e7839549e21ff9ac6fa92b317af67ff2cb700d 100644
--- a/src/frontend/app/administration/otp/otp.component.ts
+++ b/src/frontend/app/administration/otp/otp.component.ts
@@ -69,8 +69,11 @@ export class OtpComponent implements OnInit {
             apiKey: '',
             securityModes: ['sms'],
             message : {
-                sms: '',
-                email: ''
+                otp_sms : '',
+                notification : {
+                    subject: '',
+                    body: ''
+                }
             }
         };
     }
@@ -131,8 +134,6 @@ export class OtpComponent implements OnInit {
     }
 
     onSubmit() {
-        this.connector.message.sms = !this.connector.securityModes.includes('sms') ? '' : this.connector.message.sms;
-        this.connector.message.email = !this.connector.securityModes.includes('email') ? '' : this.connector.message.email;
         if (this.creationMode) {
             this.createconnector();
         } else {
@@ -212,6 +213,13 @@ export class OtpComponent implements OnInit {
         } else {
             const index = this.connector.securityModes.indexOf(ev.value);
             this.connector.securityModes.splice(index, 1);
+            this.connector.message.otp_sms = this.connector.securityModes.indexOf('sms') === -1 ? '' : this.connector.message.sms;
+            if (this.connector.securityModes.indexOf('email') === -1) {
+                this.connector.message.notification = {
+                    subject: '',
+                    body: ''
+                };
+            }
         }
     }