BRID-219 : User admin screen updates and fixes