diff --git a/internal/legacydb/legacydb.go b/internal/legacydb/legacydb.go
index c12746d..12beafd 100644
--- a/internal/legacydb/legacydb.go
+++ b/internal/legacydb/legacydb.go
@@ -100,14 +100,14 @@ WHERE crt = ''
 FROM emailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 0
   AND warning < ?`
 	sqlFindPersonalCodeSigningCertRequests = `SELECT id, csr_name, type, md, subject
 FROM emailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 1
   AND warning < ?`
 	sqlFindPersonalServerCertRequests = `SELECT id, csr_name, type, md, subject
@@ -119,14 +119,14 @@ WHERE crt_name = ''
 FROM orgemailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 0
   AND warning < ?`
 	sqlFindOrganizationalCodeSigningCertRequests = `SELECT id, csr_name, type, md, subject
 FROM orgemailcerts
 WHERE crt_name = ''
   AND csr_name != ''
-  AND keytype = 'MS'
+  AND keytype IN ('MS', 'VI')
   AND codesign = 1
   AND warning < ?`
 	sqlFindOrganizationalServerCertRequests = `SELECT id, csr_name, type, md, subject