Cleaned up Credential record
Updated for correct return value
Changed account lookup errors to tuples