Ensure default return URL is generated using helper
Correct return URLs for portlet