Merge pull request #21948 from guilherme-pg/bug1040935-unverified-account

Bug1040935 unverified account