Adding yubikey token handling for self-service