I think having a new popup warning the user that you are trying to connect to a different server with a yes / no dialogue would be a good compromise and relatively simple from an implementation point of view within the current architecture.
Would be nice if the message text for this popup was configurable.
Any ideas on ETA for this feature request @Dwarden?