Merge Rourke's changes.

My changes:
- Delay login Combat-Tag by 2 ticks to prevent issues with the secondary
  authentication system.