joined two authentication methods into one