Fixed uploading photo errors
Email cleanup