Revert login nick, fix map clear