Registration and login clean-up