rework yubisetup to be in a safer order