Some tweaking for Register / Login