--- a/client/app/auth/register_modal.html	Thu Jun 11 15:36:07 2015 +0200
+++ b/client/app/auth/register_modal.html	Thu Jun 11 15:36:42 2015 +0200
@@ -2,16 +2,37 @@
     <h3 class="modal-title">Créer un Compte</h3>
 </div>
 
-<form ng-submit="register()">
-    <div class="modal-body ng-scope">
-            <input type="text" class="form-control" ng-model='username' placeholder="Nom d'utilisateur"></input>
-            <input type="text" class="form-control" ng-model='email' placeholder="Email"></input>
-            <input type="password" class="form-control" ng-model='password' placeholder="Mot de passe"></input>
-            <input type="password" class="form-control" ng-model='password2' placeholder="Confirmer le mot de pass"></input>
+<form name="registrationForm" novalidate ng-submit="submit(registrationForm)">
+   <div class="modal-body ng-scope">
+        <h3>{{ message }}</h3> 
+       <div class="form-group">
+            <label>Email</label>
+            <input type="text" name="email" class="form-control" ng-model="user.email" required autofocus/>
+            <div ng-messages="registrationForm.email.$error">
+                <ng-messages-include src="components/messages.html"></ng-messages-include>
+            </div>
+        </div>
+        <div class="form-group">
+            <label>Mot de passe</label>
+            <input type="password" name="password" class="form-control" ng-model="user.password" required />
+            <div ng-messages="registrationForm.password.$error">
+                <ng-messages-include src="components/messages.html"></ng-messages-include>
+            </div>
+        </div>
+        <div class="form-group">
+            <label>Confirmer le mot de passe</label>
+            <input type="password" name="confirmPassword" class="form-control" 
+                   ng-model="user.confirmPassword" 
+                   required compare-to="user.password" />
+            <div ng-messages="registrationForm.confirmPassword.$error">
+                <ng-messages-include src="components/messages.html"></ng-messages-include>
+            </div>
+        </div>
     </div>
-    
     <div class="modal-footer ng-scope">
-        <button type="button" ng-click="back()" class="btn btn-warning">Retour</button>
-        <button type="submit" class="btn btn-primary">Créer</button>
+        <div class="form-group">
+            <button type="button" ng-click="back()" class="btn btn-warning">Retour</button>
+            <button type="submit" class="btn btn-primary">Créer</button>
+        </div>
     </div>
 </form>
\ No newline at end of file