Adding some functionnality to list users. Merging my change with S.Sinclair