Round 2 extended

changes in credentialService.