Mobile Client: Certificate AND Username/Password

[ldoodle]

Hi,

Is it possible to combine EAP-TLS with required username and password? I have setup a Root CA, Intermediate CA, CRL, Server Cert and a Generic User Cert, and pushed all these out to a test client.

I don't like the fact this config. can work with a Generic User Cert as there's no reliance on the Cert being active, in the sense that if I revoke or delete it on pfSense client connections still work. It seems the Windows 10 device will work as long as a User Cert is in the Personal Cert Store, irrespective if the logged in user matches anything on the User Cert or the User Cert existing in pfSense.

Unless I'm doing something wrong? Ideally I'd like each user to either:

have their own User Cert which contains their email address (and this Cert needs to exist on pfSense, or;
have the VPN config. on the client only require the Root CA with prompt for credentials to connect

Is this possible?

Thanks