El Capitan: How do I use my Apple ID password to log in after a temporary password change?

Today, I reset my User password to a temporary password for use in a service appointment. Previously, the account was using my iCloud password to log in, and I thought I could change it back to that