combat, part 2
fix login