WP-2689 updated the return url and field adjust