Edited CredentialManager class to please Lord Tristan.