Added support for user and software authentification.