Change the save order so email data is correct for manual orders Closes #4995