diff --git a/controllers/ControllerAdmin.php b/controllers/ControllerAdmin.php
index d9dbffb..f44025a 100644
--- a/controllers/ControllerAdmin.php
+++ b/controllers/ControllerAdmin.php
@@ -41,7 +41,7 @@ class ControllerAdmin {
                     break;
                 case "quitterAdmin":
                     $mdlAdmin = new MdlAdmin();
-                    $mdlAdmin->déconnexion();
+                    $mdlAdmin->deconnexion();
                     header("location: index.php");
                     break;
                 default:
@@ -80,12 +80,19 @@ class ControllerAdmin {
         Foreach ($error as $key) {
             print($key);
         }
+
         if (empty($error)) {
             $MdlAdmin = new MdlAdmin();
             $validation = $MdlAdmin->connection($_POST['name'],$_POST['password']);
             if (!empty($validation)) {
                 header("location: index.php?action=goToAdministration");
             }
+            else{
+                header("location: index.php?action=goToAdminConnexion");
+            }
+        }
+        else{
+            header("location: index.php?action=goToAdminConnexion");
         }
     }
 
diff --git a/gateways/GatewayAdmin.php b/gateways/GatewayAdmin.php
index f2dd3ba..fcde7ad 100644
--- a/gateways/GatewayAdmin.php
+++ b/gateways/GatewayAdmin.php
@@ -23,6 +23,9 @@ class GatewayAdmin
         $query = "SELECT password FROM admin WHERE username = :login;";
         $this->con->executeQuery($query, array(':login' => array($login, PDO::PARAM_STR)));
         $results=$this->con->getResults();
+        if($results == NULL){
+            return false;
+        }
         return $results[0]['password'];
     }
 
diff --git a/models/MdlAdmin.php b/models/MdlAdmin.php
index 5b5ac77..7fec81e 100644
--- a/models/MdlAdmin.php
+++ b/models/MdlAdmin.php
@@ -5,8 +5,8 @@ class MdlAdmin
     public function connection($login, $mdp){
         global $dsn,$user,$pass;
         $gatewayAdmin = new GatewayAdmin(new Connection($dsn,$user,$pass));
-
-        if(password_verify($mdp,$gatewayAdmin->getCredential($login))){
+        $pass = $gatewayAdmin->getCredential($login);
+        if($pass!=false && password_verify($mdp,$pass)){
             $_SESSION['role']='admin';
             $_SESSION['login']=$login;
             return new Admin($login,'admin');
@@ -16,7 +16,7 @@ class MdlAdmin
         }
     }
 
-    public function déconnexion(){
+    public function deconnexion(){
         session_unset();
         session_destroy();
         $_SESSION = array();
diff --git a/vues/adminConnexion.php b/vues/adminConnexion.php
index f53d5b5..fa60b37 100644
--- a/vues/adminConnexion.php
+++ b/vues/adminConnexion.php
@@ -7,7 +7,7 @@
         <label for="Nom"></label>
         <input type="text" name="name" placeholder="Nom" /><br>
         <label for="Mot de passe"></label>
-        <input type="text" name="password" placeholder="Mot de passe" /><br>
+        <input type="password" name="password" placeholder="Mot de passe" /><br>
         <input type="submit" value="OK">
     </form>
 </html>
\ No newline at end of file