Not Auth before accounts loaded fix
Not Auth before accounts loaded fix cleanup