CON-1446 | applied work from CON-1446-user-login-menu on fresh CON-Venus...

... (to be merge ready)
Extension is optional here