Q: Unable to unlock remotely locked mac

Near the end of January I decided to test the remote lock feature of iCloud.  When my Mac got the message to lock, it restarted but wasn't actually locked.  I forgot about it until today when I tried to option boot the mac so I could pick a different boot drive.  It was then that I was asked for my passcode to unlock.  I unlocked the machine and let it boot.

The problem now is that my Mac still shows as locked in Find my iPhone and does in fact continue to ask for a passcode if I try to option boot.  However, just like before, it still boots right into OS X without asking for the passcode.

What are my options to convince my Mac and iCloud that I've "recovered" my Mac?