Updated second copy of router functions for login-signup fix