Changed automatic redirect to return link