better cred handling