[Users]: Fixed some issue related to new changes