#81 improve authentication