Add 2FA (patch originally written by CSM)