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

 Fixes #2415 and #2474