diff --git a/i18n/en.yml b/i18n/en.yml
index 52fbf67..f226203 100644
--- a/i18n/en.yml
+++ b/i18n/en.yml
@@ -61,16 +61,15 @@ en:
     add_key:
       valid: "Key has been added!"
     add_item:
-      title: "Add a new item"
-      name: "Enter the name: "
-      group: "Enter the group (optional): "
-      server: "Enter the hostname or ip: "
-      protocol: "Enter the protocol of the connection (ssh, http, other): "
-      login: "Enter the login connection: "
-      password: "Enter the the password: "
-      port: "Enter the connection port (optional): "
-      comment: "Enter a comment (optional): "
-      otp_key: "Enter the otp secret (base32 secret key): "
+      name: "The item's name (mandatory"
+      group: "The group's name"
+      host: "The hostname or ip"
+      protocol: "The protocol of the connection (ssh, http, ...)"
+      login: "The login of connection"
+      password: "The password"
+      port: "The connection port"
+      comment: "A comment"
+      otp_key: "The OTP secret"
       valid: "Item has been added!"
     clipboard:
       choice: "What do you want to copy ? [q = quit, p = password, l = login]: "
diff --git a/i18n/fr.yml b/i18n/fr.yml
index b07a9e2..54da62b 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -61,16 +61,15 @@ fr:
     add_key:
       valid: "La clé a bien été ajoutée!"
     add_item:
-      title: "Ajout d'un nouvel élément"
-      name: "Entrez le nom: "
-      group: "Entrez le groupe (optionnel): "
-      server: "Entrez le nom de domaine ou l'ip: "
-      protocol: "Entrez le protocole de connexion (ssh, http, other): "
-      login: "Entrez l'identifiant de connexion: "
-      password: "Entrez le mot de passe: "
-      port: "Entrez le port de connexion (optionnel): "
-      comment: "Entrez un commentaire (optionnel): "
-      otp_key: "Entrez le secret OTP: "
+      name: "Le nom de l'élément (obligatoire)"
+      group: "Le nom du groupe"
+      host: "Le nom de domaine ou l'ip"
+      protocol: "Le protocole de connexion (ssh, http, ...)"
+      login: "L'identifiant de connexion"
+      password: "Le mot de passe"
+      port: "Le port de connexion"
+      comment: "Un commentaire"
+      otp_key: "Le secret OTP"
       valid: "L'élément a bien été ajouté!"
     clipboard:
       choice: "Que voulez-vous copier ? : "
diff --git a/templates/add_form.erb b/templates/add_form.erb
index 9cb9d1a..53c0333 100644
--- a/templates/add_form.erb
+++ b/templates/add_form.erb
@@ -1,10 +1,10 @@
 ---
-name: 
-group: 
-host: 
-protocol: 
-user: 
-password: 
-port: 
-comment: 
-otp_secret: 
+name:           # <%= I18n.t('form.add_item.name') %>
+group:          # <%= I18n.t('form.add_item.group') %> 
+host:           # <%= I18n.t('form.add_item.host') %>
+protocol:       # <%= I18n.t('form.add_item.protocol') %>
+user:           # <%= I18n.t('form.add_item.login') %>
+password:       # <%= I18n.t('form.add_item.password') %>
+port:           # <%= I18n.t('form.add_item.port') %>
+comment:        # <%= I18n.t('form.add_item.comment') %>
+otp_secret:     # <%= I18n.t('form.add_item.otp_key') %>