Fixed some errors when login in combat.