HPS: Add additional credential options

Close #1271.