MAP-498: When clicking on save and next received the follow...