Fix authenticator part of Issue #17

Signed-off-by: Francesco Vollero <raven@razorinc.org>