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

Unit Tests to come in the morning :).