SOAP-989: Now with refresh tokens