[DEV-1438] If the redirect parameter is set always use it as the redirect path#113