diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index ca7ea3569..34f9cb5cc 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -654,6 +654,11 @@ class WorldSessionActor extends Actor with MDCContextAware {
       log.info(s"New world login to $server with Token:$token. $clientVersion")
       self ! ListAccountCharacters
 
+      import scala.concurrent.duration._
+      import scala.concurrent.ExecutionContext.Implicits.global
+      clientKeepAlive.cancel
+      clientKeepAlive = context.system.scheduler.schedule(0 seconds, 500 milliseconds, self, PokeClient())
+
     case msg @ CharacterCreateRequestMessage(name, head, voice, gender, empire) =>
       log.info("Handling " + msg)
       sendResponse(PacketCoding.CreateGamePacket(0, ActionResultMessage(true, None)))
@@ -670,11 +675,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
           //TODO if yes, get continent guid accessors
           //TODO if no, get sanctuary guid accessors and reset the player's expectations
           galaxy ! InterstellarCluster.GetWorld("home3")
-
-          import scala.concurrent.duration._
-          import scala.concurrent.ExecutionContext.Implicits.global
-          clientKeepAlive.cancel
-          clientKeepAlive = context.system.scheduler.schedule(0 seconds, 500 milliseconds, self, PokeClient())
         case default =>
           log.error("Unsupported " + default + " in " + msg)
       }
@@ -1449,18 +1449,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
     tplayer.Holsters().foreach(holster => {
       SetCharacterSelectScreenGUID_SelectEquipment(holster.Equipment, gen)
     })
-    tplayer.Inventory.Items.foreach({
-      case ((_, entry : InventoryItem)) =>
-        SetCharacterSelectScreenGUID_SelectEquipment(Some(entry.obj), gen)
-        tplayer.Slot(5).Equipment match {
-          case Some(locker) =>
-            locker.GUID = PlanetSideGUID(gen.getAndIncrement)
-            locker.asInstanceOf[LockerContainer].Inventory.Items.foreach({ case ((_, entry : InventoryItem)) =>
-              SetCharacterSelectScreenGUID_SelectEquipment(Some(entry.obj), gen)
-            })
-          case None => ;
-        }
-    })
     tplayer.GUID = PlanetSideGUID(gen.getAndIncrement)
   }
 
@@ -1492,17 +1480,6 @@ class WorldSessionActor extends Actor with MDCContextAware {
     tplayer.Holsters().foreach(holster => {
       RemoveCharacterSelectScreenGUID_SelectEquipment(holster.Equipment)
     })
-    tplayer.Inventory.Items.foreach({ case((_, entry : InventoryItem)) =>
-      RemoveCharacterSelectScreenGUID_SelectEquipment(Some(entry.obj))
-    })
-    tplayer.Slot(5).Equipment match {
-      case Some(locker) =>
-        locker.Invalidate()
-        locker.asInstanceOf[LockerContainer].Inventory.Items.foreach({ case((_, entry : InventoryItem)) =>
-          RemoveCharacterSelectScreenGUID_SelectEquipment(Some(entry.obj))
-        })
-      case None => ;
-    }
     tplayer.Invalidate()
   }