Moved account type change to after no account check
Removed unicode decoding of real