Fix to correctly use username/password