diff --git a/gamemode/engine/core/server/sv_player_init.lua b/gamemode/engine/core/server/sv_player_init.lua
index b17cbf0..c2f2206 100644
--- a/gamemode/engine/core/server/sv_player_init.lua
+++ b/gamemode/engine/core/server/sv_player_init.lua
@@ -10,14 +10,11 @@ Quantum.Server.Player = {}
 local ply = FindMetaTable( "Player" )
 
 function GM:PlayerInitialSpawn( ply )
-    ply.isloaded = true -- REMOVE THIS WHEN MYSQL DB IS ADDED
+    ply.isloaded = false -- REMOVE THIS WHEN MYSQL DB IS ADDED
     -- load in all of the players characters and stuff from the MySQL DB
 end
 
 local function setUpPlayer( ply )
-    
-    Quantum.Server.Char.SetCurrentCharacter( ply, ply.charindex || 1 )
-
     if( ply:GetModel() ~= nil ) then
         ply:SetupHands()
     else
@@ -30,7 +27,6 @@ function GM:PlayerSpawn( ply )
 
     if( !ply.isloaded ) then 
         ply:Spectate( OBS_MODE_FIXED ) 
-        -- set cinematic view here
         Quantum.Net.OpenMenu( ply, "character", Quantum.Server.Char.GetPlayerChars( ply ) )
     else
         ply:UnSpectate() 
diff --git a/gamemode/engine/derma/menus/menu_character.lua b/gamemode/engine/derma/menus/menu_character.lua
index afbeb68..b425828 100644
--- a/gamemode/engine/derma/menus/menu_character.lua
+++ b/gamemode/engine/derma/menus/menu_character.lua
@@ -520,6 +520,7 @@ function menu.open( dt )
                 -- enter world --
                 local dt = { index = selectedChar.index }
                 snm.RunNetworkedFunc( "enterWorldChar", dt ) -- FIX CRASH ISSUE ( 0xC00000FD )
+                f:Close() -- close the frame
             end
             p.enter.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end
 		end