Add issuer to Authenticator account and small performance optimizations