Adding fixes for correct re-direction after signup failed