Fix the 2FA setup and also make some changes so that the transition towards a new token format introduced in a previous PR happens more smoothly
Fix the 2FA setup and also make some changes so that the transition towards a new token format introduced in a previous PR happens more smoothly