Switch User then logoff, back to ctrl-alt-del login not previous user

On windows 7 professional 64-bit sp1,
if a current user is screen locked, the lock screen indicates the current user name and account is logged on and the computer is locked. I am using Classic Logon in group policy,
and under local policy-security options-interactive logon i have it set to display username and account info (the option with most information).

the problem i have is say a user is logged in and then I need to use the computer,
at that point the lock screen says so and so is logged in and locked,
I do a switch user, log in and do my thing, then log out.
Now the screen goes back to the base login screen saying 'ctrl-alt-del' not saying any user is currently logged in.
Now if that original user does log back in, all his stuff is still here and everything acted like a basic screen lock happened so no problem there... but what i want to happen is after a switch user logs out the screen goes back to the lock screen displaying who has the computer locked. is there a way to do that?
thanks.

At a guess, I'd say Classic Logon is the culprit here, as I do not have this issue with Windows 7 64-bit SP1 with the default login screen. Changing this is likely impractical next to the simple solution of ditching Classic Logon (It's an ancient artifact by now)