diff --git a/src/Application/Actions/User/CreateUserAction.php b/src/Application/Actions/User/CreateUserAction.php
index 0f727ac2d58b13fd2fa89a2186271d9079264816..2ec2ede2ae5a4ce01752f94cce2a627e6e7bb0c7 100755
--- a/src/Application/Actions/User/CreateUserAction.php
+++ b/src/Application/Actions/User/CreateUserAction.php
@@ -5,7 +5,8 @@ namespace App\Application\Actions\User;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use App\Domain\User\User ;
+use App\Domain\User\User;
+use GeoIp2\Database\Reader;
 use DateTime;
 
 class CreateUserAction extends UserAction
@@ -44,6 +45,40 @@ class CreateUserAction extends UserAction
             );
         }
 
+        if ($this->userRepository->findOneBy(array('username' =>  $username))){
+            return $this->twig->render(
+                $this->response, "/user/create_user.twig",
+                array(
+                    "username" => $username,
+                    "firstname" => $firstname,
+                    "lastname" => $lastname,
+                    "mail" => $mail,
+                    "contaminated" => $contaminated,
+                    "password" => null,
+                    "confirmpassword" => null,
+                    "message" => "Username already used",
+                    "formstatus" => "error"
+                )
+            );
+        }
+
+        if ($this->userRepository->findOneBy(array('mail' =>  $mail))){
+            return $this->twig->render(
+                $this->response, "/user/create_user.twig",
+                array(
+                    "username" => $username,
+                    "firstname" => $firstname,
+                    "lastname" => $lastname,
+                    "mail" => $mail,
+                    "contaminated" => $contaminated,
+                    "password" => null,
+                    "confirmpassword" => null,
+                    "message" => "Mail already used",
+                    "formstatus" => "error"
+                )
+            );
+        }
+        
         $password = password_hash($password, PASSWORD_DEFAULT);
 
         $date = new DateTime('now');