Notification-related bugfixes

Fix unsetting the secondary email address not being accepted, and fix notifications breaking because of a missing "id" field in our fake system entity.