[NOISSUE]
fixed member attribute
[NOISSUE]
fix for new credential type
[NOISSUE]
code cleanup