Added two-factor-authentication support