Fix Roles passord issue