Two-factor disenroll button, other fixes for authy support