Added some secondary checks for lowercase accounts