* Fixed an error for form wizard (and others...) where the return URL would be wrong...