misc

Email upgrade
Cleanup
Username added to user index
fixed user lookup criterium