improve authentication to be user sensitive