Above and Below Display Arrangement in El Capitan Now with more El Capitan, and a change of screen layout.  Apple seems to be deliberately mocking me!

I have a laptop running Yosemite El Capitan with an external monitor sitting above next to the laptops display.  When I am logged in I have the display arrangement mimicking the physical above and below side by side layout.  This works and is good.

However when I am logged out the Yosemite El Capitan login screen reverts to an side by side above and below arrangement.  

I would like Yosemite El Capitan to keep the side by side arrangement even when I am logged out, but the display arrangement in the System Preferences is per logged in account.  

So what would I do to set the arrangement when there is no logged in account?
I think I may have just solved it.  I have two accounts on this Mac, my Admin account and my daily use account.  The admin account didn't have the same screen orientation as the the daily use account, and on the login screen the admin account was listed first.  I suspect that when no accounts are logged in that OS X grabs the screen configuration of the first account that it finds - which happened to be the admin account in my case.