Fixed "Login/Register" conflicts