Fix issue #154

Fixes issue #154. Second commit fixes whitespace.

This probably needs a second eye. It appears that respawning drops the users from half the height of logging in.