User find by email improvements...