giza: improved credentials support