fix credential generation issues