Added logic for cheking email and fixe pictures paths