diff --git a/src/Controller/AuthController.php b/src/Controller/AuthController.php
index 1628d9c..acc3aab 100644
--- a/src/Controller/AuthController.php
+++ b/src/Controller/AuthController.php
@@ -26,37 +26,37 @@ class AuthController {
         return ViewHttpResponse::twig("display_register.html.twig", []);
     }
 
-    private function displayRegisterBadFields(array $fails): HttpResponse{
+    private function displayBadFields(string $viewName, array $fails): HttpResponse{
         $bad_fields = [];
         foreach ($fails as $err) {
             if ($err instanceof FieldValidationFail) {
                 $bad_fields[] = $err->getFieldName();
             }
         }
-        return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+        return ViewHttpResponse::twig($viewName, ['bad_fields' => $bad_fields]);
     }
     public function confirmRegister(array $request): HttpResponse {
 
         $fails = [];
         $request = HttpRequest::from($request, $fails, [
-            "username" => [Validators::name(), Validators::lenBetween(0, 32)],
+            "username" => [Validators::name(), Validators::lenBetween(2, 32)],
             "password" => [Validators::lenBetween(6, 256)],
             "confirmpassword" => [Validators::lenBetween(6, 256)],
-            "email" => [Validators::regex("/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g"),Validators::lenBetween(5, 256)]
+            "email" => [Validators::regex("/^\\S+@\\S+\\.\\S+$/"),Validators::lenBetween(5, 256)]
         ]);
 
 
         if (!empty($fails)) {
-            return $this->displayRegisterBadFields($fails);
+            return $this->displayBadFields("display_register.html.twig",$fails);
         }
 
-        $fails = $this->model->validationRegister($request['username'], $request["password"], $request['confirmpassword'], $request['email']);
+        $fails = $this->model->register($request['username'], $request["password"], $request['confirmpassword'], $request['email']);
         if (empty($fails)) {
             $results = $this->model->getUserFields($request['email']);
             return ViewHttpResponse::twig("display_auth_confirm.html.twig", ['username' => $results['username'], 'email' => $results['email']]);
         }
 
-        return $this->displayRegisterBadFields($fails);
+        return $this->displayBadFields("display_register.html.twig",$fails);
     }
 
     public function displayLogin():HttpResponse{
@@ -66,18 +66,18 @@ class AuthController {
     public function displayLoginPassed(array $request):HttpResponse{
         $fails = [];
         $request = HttpRequest::from($request, $fails, [
-            "password" => [Validators::lenBetween(0, 256)],
-            "email" => [Validators::regex("/@/")]
+            "password" => [Validators::lenBetween(6, 256)],
+            "email" => [Validators::regex("/^\\S+@\\S+\\.\\S+$/"),Validators::lenBetween(5, 256)]
         ]);
 
 
-        $fails = $this->model->validationLogin($request['email'],$request['password']);
+        $fails = $this->model->login($request['email'],$request['password']);
 
         if (empty($fails)){
             $results = $this->model->getUserFields($request['email']);
             return ViewHttpResponse::twig("display_auth_confirm.html.twig",['username' => $results['username'], 'email' => $results['email']]);
         }
-        return $this->displayRegisterBadFields($fails);
+        return $this->displayBadFields("display_login.html.twig",$fails);
     }
 
 }
\ No newline at end of file
diff --git a/src/Model/AuthModel.php b/src/Model/AuthModel.php
index febe186..fd00bb8 100644
--- a/src/Model/AuthModel.php
+++ b/src/Model/AuthModel.php
@@ -18,11 +18,11 @@ class AuthModel {
     }
 
 
-    public function validationRegister(string $username, string $password, string $confirmPassword,string $email): array {
+    public function register(string $username, string $password, string $confirmPassword,string $email): array {
         $errors = [];
 
         if ($password != $confirmPassword) {
-            $errors[] = new FieldValidationFail("confirmpassword","passwords not equals");
+            $errors[] = new FieldValidationFail("confirmpassword","password and password confirmation are not equals");
         }
 
         if ($this->gateway->mailExist($email)){
@@ -42,7 +42,7 @@ class AuthModel {
     }
 
 
-    public function validationLogin(string $email,string $password): array{
+    public function login(string $email,string $password): array{
         $errors = [];
 
         if (!$this->gateway->mailExist($email)) {
diff --git a/src/Views/display_auth_confirm.html.twig b/src/Views/display_auth_confirm.html.twig
index 89823f4..60c63b2 100644
--- a/src/Views/display_auth_confirm.html.twig
+++ b/src/Views/display_auth_confirm.html.twig
@@ -1,5 +1,3 @@
-
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
diff --git a/src/Views/display_error_validation_register.html.twig b/src/Views/display_error_validation_register.html.twig
index 3903a16..95befc0 100644
--- a/src/Views/display_error_validation_register.html.twig
+++ b/src/Views/display_error_validation_register.html.twig
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
diff --git a/src/Views/display_login.html.twig b/src/Views/display_login.html.twig
index 48d4bfd..33b2385 100644
--- a/src/Views/display_login.html.twig
+++ b/src/Views/display_login.html.twig
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
diff --git a/src/Views/display_register.html.twig b/src/Views/display_register.html.twig
index a082638..40199a0 100644
--- a/src/Views/display_register.html.twig
+++ b/src/Views/display_register.html.twig
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
diff --git a/src/Views/display_results.html.twig b/src/Views/display_results.html.twig
index 60c3692..a33546b 100644
--- a/src/Views/display_results.html.twig
+++ b/src/Views/display_results.html.twig
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
diff --git a/src/Views/sample_form.html.twig b/src/Views/sample_form.html.twig
index bcb958e..6f4a9b5 100644
--- a/src/Views/sample_form.html.twig
+++ b/src/Views/sample_form.html.twig
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">