added option of using email for username display
removed debug
indent fix, and still TODO