Re #7311 Make sure creds are stored in proper type