How can I disable the iCloud login prior to the local user login in El Capitan? 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.
It turns out the main issue is that I'm using FaultVault encryption. On restart, the login screen showing user photos is part of FileVault, and happens before booting OS X, so it doesn't utilize the login screen preferences.

When you simply logout, you're shown the actual OS X login screen, as the machine is already booted. That screen does utilize the preferences and appears as I expected.