fix for enabling add, remove, lock button
fix for saving email