MIFOSX-1546 - UX improved