Changes made to fix defects indentified during FB and Email Verification integration test found.