I kept getting a double login screen after I updated to 10.11.5 and I didn't have FileVault enabled. I tried changing the password to see if that would fix it. It appears that it did but now every time my Mac wakes, I see a message "Finish changing your password." When I click Details, it opens iCloud settings and prompts me for my Mac password. After I enter it, nothing really happens and then the same message appears again each time I wake it or restart. I tried signing out of iCloud completely and logging back in. Has anyone else run into this?