Move authentication to use username and password