Take identity activation out of keychain init