Improving 2FA set-up