diff --git a/.gitignore b/.gitignore
index 3a4561d..5896146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ project/target
 target
 tmp
 .idea
+*.iml
 Play20StartApp.iml
 db
 .classpath
diff --git a/app/controllers/Application.java b/app/controllers/Application.java
index f976dd1..aa0a5d8 100644
--- a/app/controllers/Application.java
+++ b/app/controllers/Application.java
@@ -89,6 +89,9 @@ public static class Register {
         @Constraints.Required
         public String inputPassword;
 
+        @Constraints.Required
+        public String confirmPassword;
+
         /**
          * Validate the authentication.
          *
@@ -107,6 +110,18 @@ public String validate() {
                 return "Password is required";
             }
 
+            if (isBlank(confirmPassword)) {
+                return "Confirm Password is required";
+            }
+
+            if (isBlank(confirmPassword)) {
+                return "Confirm Password is required";
+            }
+
+            if (!inputPassword.equals(confirmPassword)) {
+                return "Passwords do not match";
+            }
+
             return null;
         }
 
diff --git a/app/views/account/signup/createFormOnly.scala.html b/app/views/account/signup/createFormOnly.scala.html
index 2b71eb1..6dde89c 100644
--- a/app/views/account/signup/createFormOnly.scala.html
+++ b/app/views/account/signup/createFormOnly.scala.html
@@ -23,6 +23,11 @@ <h3>@Messages("signup.new")</h3>
         '_label -> null,
         'placeholder -> Messages("password")
     )
+    @inputPassword(
+        signupForm("confirmPassword"),
+        '_label -> null,
+        'placeholder -> Messages("confirmPassword")
+    )
     <h6>@Messages("signup.generate.password")</h6>
     <input type="text" name="passwordGenerated" />
 </fieldset>
diff --git a/conf/messages.en b/conf/messages.en
index f2666eb..225f8e0 100644
--- a/conf/messages.en
+++ b/conf/messages.en
@@ -6,6 +6,7 @@ fullname=Full Name
 goback=Go Back
 logout=Logout
 password=Password
+confirmPassword=Confirm Password
 error.technical=Technical Error, please Retry
 validate=Validate
 reset=Reset
diff --git a/conf/messages.fr b/conf/messages.fr
index 53e10dd..a84ed7d 100644
--- a/conf/messages.fr
+++ b/conf/messages.fr
@@ -31,6 +31,7 @@ fullname=Nom Complet
 goback=Retour
 logout=Déconnexion
 password=Mot de passe
+confirmPassword=Confirmation du mot de passe
 error.technical=Erreur Technique, veuillez retenter
 validate=Valider
 reset=Valider