Trying to move auth from token based to Basic auth