ICC-13 fixing user disable option
Reverting chnages for users disable option for admins
ICC-18 fixed