Fix in service credential setup to work with front-end.