Making sure that email notification settings stay in sync.

Also registering UserLoadOptions hook (oops!)

Finally, getting rid of old override system that is now obsolete.

Change-Id: Ie264981eb20f1e3d3c83721bc376d79e2f5a1430
Merge "Making sure that email notification settings stay in sync."