Fix disabling of 2FA

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Some 2FA setup template improvements

Signed-off-by: Shitiz Garg <mail@dragooon.net>