diff --git a/Server/src/main/content/minigame/barbassault/lobby/BarbTeam.kt b/Server/src/main/content/minigame/barbassault/lobby/BarbTeam.kt
index eec927186..ba79aa86a 100644
--- a/Server/src/main/content/minigame/barbassault/lobby/BarbTeam.kt
+++ b/Server/src/main/content/minigame/barbassault/lobby/BarbTeam.kt
@@ -181,6 +181,7 @@ object BarbTeamManager {
             it.sendMessage("Your leader has left the room and therefore cleared the team!")
             it.removeAttribute("ba-session")
             updateCurrentTeam(it)
+            //todo Do not  forget to remove this latter.
             if (session.state == BarbassaultState.STARTING) {
                 it.properties.teleportLocation = Location.create(2593, 5264, 0)
             }
diff --git a/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt b/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt
index f3cb4d6e2..7d3d4eb2a 100644
--- a/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt
+++ b/Server/src/main/content/minigame/barbassault/lobby/BarbassaultLobby.kt
@@ -188,9 +188,9 @@ class BarbassaultLobby : InteractionListener, MapArea {
                     when (buttonId) {
                         2 -> {
                             if (player.inventory.add(Item(Items.SCROLL_10512, 1))) {
-                                if (createTeam(player)){
+                               // if (createTeam(player)){
                                     player.sendMessage("You take scroll from table")
-                                }
+                               // }
                             } else {
                                 player.sendMessage("You dont have enough inventory space")
                             }
@@ -252,12 +252,14 @@ class BarbassaultLobby : InteractionListener, MapArea {
     fun writeRole(player: Player, buttonId: Int) {
         if (buttonId == 6) return
         val playerRole = getRoleFromButton(buttonId) ?: return
-        if (player.baSession?.team != null) {
-            player.baSession?.team?.setRoleForPlayer(player, playerRole)
-            BarbTeamManager.updateTeam(player.baSession?.team!!)
-            sendMessage(player, "You've set your role to ${playerRole.name.lowercase().replaceFirstChar { it.uppercase() }}"
-            )
-        }
+
+        if (player.baSession == null) {createTeam(player)}
+
+        val team = player.baSession?.team ?: return
+        team.setRoleForPlayer(player, playerRole)
+        BarbTeamManager.updateTeam(team)
+        sendMessage(player, "You've set your role to ${playerRole.name.lowercase().replaceFirstChar { it.uppercase() }}")
+
     }
 
     fun handlePlayerOptionDoor(player: Player, roomRoleOptions:(RoomRole) -> Unit){
@@ -307,7 +309,6 @@ class BarbassaultLobby : InteractionListener, MapArea {
                     //player.baSession = null
                     abandonTeam(player)
                     closeOverlay(player)
-                    player.inventory.removeAll(Items.SCROLL_10512)
                 } else {
                     openOverlay(player, iface)
                    // player.sendMessage("you enter wave ${BARBWAVEDOOR[node.id]}")