Fixing issue in undefined email