Fix for #869 - Change "returnURL" for some pages.