fix missing calls to two factor token policy
add back in key material to entities