Fixed add/edit, works like other microsoft settings now