added email support in user upload; removed commented old code