Thanks for the research!
I think your first suggestion is closer to what we are looking for. Unfortunately, it does require client configuration.
We are talking about technically challenged users who are only entitled to one desktop, but may need to connect from any one of several thin clients/fat clients during any given day.
In other words: skip the choice of desktop/options when the user is only entitled to one desktop.
Thx.
-J