Fix for #869 - Change "returnURL" for some pages.
Merge branch 'Bug-869' into staging