use email uid's instead of numbers
minor UI changes