Put username and password support back in, remove http://None bug.