diff --git a/api-rest/gateways/userGateway.php b/api-rest/gateways/userGateway.php
index 4ef1d2d..9226c83 100644
--- a/api-rest/gateways/userGateway.php
+++ b/api-rest/gateways/userGateway.php
@@ -23,29 +23,38 @@ class UserGateway{
 
     */
 
+/*
 /// Brief : Returning an array of users containing all the user stored in database
     public function getUsers():array{
         $tabUser=NULL;
-        $query= "SELECT * FROM User";
+        $query1= "SELECT * FROM User";
+        $query2="SELECT idSkin FROM HasSkin WHERE idUser=:idUser";
         $this->connection->execQuery($query,[]);
         $res=$this->connection->getRes();
         foreach($res as $row){
-            $tabUser[] = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed']);
+            $tabUser[] = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed'],$row['currentIdSkin']);
         }
         
         return $tabUser;
     }
+*/
 
 /// Brief : Returning an user found in database with his id
 /// Parameters : * $id (string): identifier of the user we are looking for
     public function getUserById(string $id):?User{
         $usr=NULL;
         $query= "SELECT * FROM User U WHERE id = :id ";
+        $query2="SELECT idSkin FROM HasSkin WHERE idUser=:id";
         $arg= array('id'=> array($id,PDO::PARAM_STR));
+        $this->connection->execQuery($query2,$arg);
+        $res=$this->connection->getRes();
+        foreach($res as $row){
+            $tabSkin[]=$row['idSkin'];
+        }
         $this->connection->execQuery($query,$arg);
         $res=$this->connection->getRes();
         foreach($res as $row){
-            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed']);
+            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed'],$row['currentIdSkin'],$tabSkin);
         }
         return $usr;
     }
@@ -54,13 +63,22 @@ class UserGateway{
 /// Parameters : * $username (string): username of the user we are looking for
     public function getUserByUsername(string $username):?User{
         $usr=NULL;
+        
         $query= "SELECT * FROM User U WHERE username = :username ";
+        $query2="SELECT idSkin FROM HasSkin WHERE idUser=:id";
         $arg = array('username'=>array($username,PDO::PARAM_STR));
         $this->connection->execQuery($query,$arg);
         $res=$this->connection->getRes();
         foreach($res as $row){
-            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed']);
+            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed'],$row['currentIdSkin'],null);
         }
+        $arg2=array('id'=>array($usr->id, PDO::PARAM_STR));
+        $this->connection->execQuery($query2,$arg2);
+        $res=$this->connection->getRes();
+        foreach($res as $row){
+            $tabSkin[]=$row['idSkin'];
+        }
+        $usr->listIdSkin=$tabSkin;
         return $usr;
     }
 
@@ -72,12 +90,20 @@ class UserGateway{
     public function getUserForConnection(string $username, string $password):?User{
         $usr=NULL;
         $query= "SELECT * FROM User U WHERE username = :username AND password = :password";
+        $query2="SELECT idSkin FROM HasSkin WHERE idUser=:id";
         $arg = array('username'=>array($username,PDO::PARAM_STR),'password'=>array($password,PDO::PARAM_STR));
         $this->connection->execQuery($query,$arg);
         $res=$this->connection->getRes();
         foreach($res as $row){
-            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed']);
+            $usr = new User ($row['id'],$row['username'],$row['password'],$row['nationality'],$row['sex'],$row['dateOfBirth'],$row['currentBobCoins'],$row['totalBobCoins'],$row['nbGamesPlayed'],$row['currentIdSkin'],null);
         }
+        $arg2=array('id'=>array($usr->id, PDO::PARAM_STR));
+        $this->connection->execQuery($query2,$arg2);
+        $res=$this->connection->getRes();
+        foreach($res as $row){
+            $tabSkin[]=$row['idSkin'];
+        }
+        $usr->listIdSkin=$tabSkin;
         return $usr;
     }
 
@@ -88,17 +114,42 @@ class UserGateway{
             echo "new user, can't have any coin or games played";
             return;
         }
-        $query = "INSERT INTO User VALUES (:id, :username, :password, :nationality, :sex, :dateOfBirth, 0, 0, 0)";
-        $arg=array('id' => array($u->id, PDO::PARAM_STR), 'username' => array($u->username, PDO::PARAM_STR), 'password' => array($u->password, PDO::PARAM_STR),'nationality' => array($u->nationality, PDO::PARAM_STR), 'sex' => array($u->sex, PDO::PARAM_STR),'dateOfBirth' => array($u->dateOfBirth, PDO::PARAM_STR));
+        $query = "INSERT INTO User VALUES (:id, :username, :password, :nationality, :sex, :dateOfBirth, 0, 0, 0, 'S0001')";
+        $query2 = "INSERT INTO HasSkin VALUES(:id,'S0001')";
+        $arg=array('id' => array($u->id, PDO::PARAM_STR), 
+                   'username' => array($u->username, PDO::PARAM_STR), 
+                   'password' => array($u->password, PDO::PARAM_STR),
+                   'nationality' => array($u->nationality, PDO::PARAM_STR), 
+                   'sex' => array($u->sex, PDO::PARAM_STR),
+                   'dateOfBirth' => array($u->dateOfBirth, PDO::PARAM_STR));
+        $arg2=array('id' => array($u->id, PDO::PARAM_STR));
         $this->connection->execQuery($query, $arg);
+        $this->connection->execQuery($query2,$arg2);
     }
 
 /// Brief : Modifying an EXISTING user in database
 /// Parameters : * $u (User): user we want to update in database
     public function putUser(User $u){
-        $query="UPDATE User SET username = :username, password=:password, sex=:sex, nationality=:nationality, currentBobCoins=:currentBobCoins, totalBobCoins=:totalBobCoins, nbGamesPlayed=:nbGamesPlayed WHERE id=:id";
-        $arg=array(':id' => array($u->id, PDO::PARAM_STR), ':username' => array($u->username, PDO::PARAM_STR), ':password' => array($u->password, PDO::PARAM_STR),':nationality' => array($u->nationality, PDO::PARAM_STR), ':sex' => array($u->sex, PDO::PARAM_STR),':currentBobCoins' => array($u->currentBobCoins, PDO::PARAM_INT),':totalBobCoins' => array($u->totalBobCoins, PDO::PARAM_INT), ':nbGamesPlayed' => array($u->nbGamesPlayed, PDO::PARAM_INT));
+        $query="UPDATE User SET username = :username, password=:password, sex=:sex, nationality=:nationality, currentBobCoins=:currentBobCoins, totalBobCoins=:totalBobCoins, nbGamesPlayed=:nbGamesPlayed, currentIdSkin=:currentIdSkin WHERE id=:id";
+        $query2="DELETE FROM HasSkin WHERE idUser=:id";
+        $query3="INSERT INTO HasSkin VALUES(:idUsr,:idSkin)";
+        $arg=array(':id' => array($u->id, PDO::PARAM_STR), 
+                   ':username' => array($u->username, PDO::PARAM_STR), 
+                   ':password' => array($u->password, PDO::PARAM_STR),
+                   ':nationality' => array($u->nationality, PDO::PARAM_STR), 
+                   ':sex' => array($u->sex, PDO::PARAM_STR),
+                   ':currentBobCoins' => array($u->currentBobCoins, PDO::PARAM_INT),
+                   ':totalBobCoins' => array($u->totalBobCoins, PDO::PARAM_INT), 
+                   ':nbGamesPlayed' => array($u->nbGamesPlayed, PDO::PARAM_INT),
+                   ':currentIdSkin'=> array($u->currentIdSkin, PDO::PARAM_STR));
+        $arg2=array('id'=>array($u->id,PDO::PARAM_STR));
         $this->connection->execQuery($query, $arg);
+        $this->connection->execQuery($query2,$arg2);
+        foreach($u->listIdSkin as $idSkin){
+            $arg3=array('idUsr'=>array($u->id,PDO::PARAM_STR),
+                        'idSkin'=>array($idSkin,PDO::PARAM_STR));
+            $this->connection->execQuery($query3,$arg3);
+        }
     } 
 
 /// Brief : Deleting an user from database
diff --git a/api-rest/index.php b/api-rest/index.php
index 4d8c9b0..cfd3aa4 100644
--- a/api-rest/index.php
+++ b/api-rest/index.php
@@ -1,5 +1,9 @@
+ <?php
+ 
+    /// Good to know :
+    /// All the values must be cleaned on the application side before using this API
+    ///
 
- <?php 
     include ('dbConnection.php');
     include ('gateways/userGateway.php');
     include ('gateways/matchGateway.php');
diff --git a/api-rest/model/user.php b/api-rest/model/user.php
index 92f83be..50b3fc3 100644
--- a/api-rest/model/user.php
+++ b/api-rest/model/user.php
@@ -12,8 +12,10 @@ class User {
     public int $currentBobCoins;
     public int $totalBobCoins;
     public int $nbGamesPlayed;
+    public string $currentIdSkin;
+    public $listIdSkin;
 
-    public function __construct(string $_id,string $_username,string $_password, string $_nationality,string $_sex, string $_dateOfBirth, int $_currentBobCoins, int $_totalBobCoins, int $_nbGamesPlayed){
+    public function __construct(string $_id,string $_username,string $_password, string $_nationality,string $_sex, string $_dateOfBirth, int $_currentBobCoins, int $_totalBobCoins, int $_nbGamesPlayed, string $_currentIdSkin, $_listIdSkin){
         $this->id=$_id;
         $this->username=$_username;
         $this->password=$_password;
@@ -23,6 +25,8 @@ class User {
         $this->currentBobCoins=$_currentBobCoins;
         $this->totalBobCoins=$_totalBobCoins;
         $this->nbGamesPlayed=$_nbGamesPlayed;
+        $this->currentIdSkin=$_currentIdSkin;
+        $this->listIdSkin=$_listIdSkin;
     }
     
 }