Reg/Login fix