fix saveReturnUrl bug
Merge branch 'henryleu'