Fasttrack: make credentials handling more robust