modified credential parsing