EMM-660 : resolved the user experience with operation restrictions