Fixes #1466 Account awaiting activation notification settings

Fixes #1466 Account awaiting activation notification settings
Fixes #1007 account awaiting activation bug