Fix for First Login After SignUp -- Asks for Signup again

Issue #2415