Fixed issues with email and accounts