Initial redirect now has the return param set