diff --git a/Project/php/gateway/UserGateway.php b/Project/php/gateway/UserGateway.php
index f62343b..91cddf8 100755
--- a/Project/php/gateway/UserGateway.php
+++ b/Project/php/gateway/UserGateway.php
@@ -251,7 +251,7 @@ class UserGateway extends AbsGateway
         }
     }
 
-    public function modifyGroup(int $id, int $newGroup) {
+    public function modifyGroup(int $id, int $newGroup = null) {
         try {
             $query="UPDATE User_ SET groupID=:group WHERE id=:id";
             $args = array(':id' => array($id, PDO::PARAM_INT), ':group' => array($newGroup, PDO::PARAM_STR));
diff --git a/Project/php/model/MdlAdmin.php b/Project/php/model/MdlAdmin.php
index 5ef1b38..e20828e 100755
--- a/Project/php/model/MdlAdmin.php
+++ b/Project/php/model/MdlAdmin.php
@@ -23,22 +23,22 @@ class MdlAdmin extends AbsModel
         else return null;
     }*/
 
-    public function showAllUsers(): array {
+    public function getAllUsers(): array {
         $gtw = new UserGateway();
         return $gtw->findAll();
     }
 
-    public function showAllAdmins(): array {
+    public function getAllAdmins(): array {
         $gtw = new UserGateway();
         return $gtw->findAllAdmins();
     }
 
-    public function showAllTeachers(): array {
+    public function getAllTeachers(): array {
         $gtw = new UserGateway();
         return $gtw->findAllTeachers();
     }
 
-    public function showAllStudents(): array {
+    public function getAllStudents(): array {
         $gtw = new UserGateway();
         return $gtw->findAllStudents();
     }
@@ -48,7 +48,7 @@ class MdlAdmin extends AbsModel
         $gtw->remove($id);
     }
 
-    public function showAllGroups(): array {
+    public function getAllGroups(): array {
         $gtw = new GroupGateway();
         return $gtw->findAll();
     }
@@ -60,7 +60,7 @@ class MdlAdmin extends AbsModel
 
     public function removeUserFromGroup(int $id): void {
         $gtw = new UserGateway();
-        $gtw->modifyGroup($id, 0);
+        $gtw->modifyGroup($id);
     }
 
     public function removeGroup(int $id): void {