After upgrading to El Capitan I get an initial login screen with my name and round icon, which wants my iCloud password. After that I get the username and password screen, where I enter my local username and password.
I want to just enter my local username and password. Is there a way to disable the iCloud login? I seem to recall selecting something related to that when installing, but I don't see anything about it in my login preferences.