added save/restore email addresses