Backport "OU selector: Fix fallback logic" to 4.1-stable

Backport PR #716 to [`4.1-stable` branch](https://github.com/4teamwork/opengever.core/tree/4.1-stable).