Fixes #1007 account awaiting activation bug