diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
index 92f9fbaf2e8..a9b21234c49 100644
--- a/src/main/java/seedu/address/logic/Messages.java
+++ b/src/main/java/seedu/address/logic/Messages.java
@@ -44,7 +44,7 @@ public static String format(Person person) {
                 .append("; Address: ")
                 .append(person.getAddress())
                 .append("; Meeting Time: ")
-                .append(person.getMeetingTime())
+                .append(person.getMeetingTimeString())
                 .append("; Tags: ");
         person.getTags().forEach(builder::append);
         return builder.toString();
diff --git a/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java b/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java
index 39dd10a2916..9de63f7135d 100644
--- a/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java
@@ -5,6 +5,7 @@
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.commons.core.index.Index;
@@ -65,7 +66,7 @@ public CommandResult execute(Model model) throws CommandException {
         Email email = personToConvert.getEmail();
         Address address = personToConvert.getAddress();
         Set<Tag> tags = new HashSet<>(personToConvert.getTags());
-        MeetingTime meetingTime = new MeetingTime(personToConvert.getMeetingTime().toString());
+        Optional<MeetingTime> meetingTime = personToConvert.getMeetingTime();
 
         // TODO: Add more fields from client to lead
 
diff --git a/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java b/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java
index 0972bf309b5..58c12225c5a 100644
--- a/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java
@@ -5,6 +5,7 @@
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.commons.core.index.Index;
@@ -65,7 +66,7 @@ public CommandResult execute(Model model) throws CommandException {
         Email email = personToConvert.getEmail();
         Address address = personToConvert.getAddress();
         Set<Tag> tags = new HashSet<>(personToConvert.getTags());
-        MeetingTime meetingTime = new MeetingTime(personToConvert.getMeetingTime().toString());
+        Optional<MeetingTime> meetingTime = personToConvert.getMeetingTime();
         // TODO: Add more fields from lead to client
 
         Client convertedClient = new Client(name, phone, email, address, meetingTime, tags);
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 1df4cb00fe1..c23384aa3a3 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -3,6 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEETING_TIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
@@ -46,6 +47,7 @@ public class EditCommand extends Command {
             + "[" + PREFIX_PHONE + "PHONE] "
             + "[" + PREFIX_EMAIL + "EMAIL] "
             + "[" + PREFIX_ADDRESS + "ADDRESS] "
+            + "[" + PREFIX_MEETING_TIME + "MEETING_TIME] "
             + "[" + PREFIX_TAG + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
@@ -81,7 +83,8 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
         Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
         Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
-        MeetingTime updatedMeetingTime = editPersonDescriptor.getMeetingTime().orElse(personToEdit.getMeetingTime());
+        Optional<MeetingTime> updatedMeetingTime = editPersonDescriptor.getMeetingTime()
+                .or(personToEdit::getMeetingTime);
         Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
 
         if (personToEdit.isClient()) {
@@ -145,7 +148,7 @@ public static class EditPersonDescriptor {
         private Phone phone;
         private Email email;
         private Address address;
-        private MeetingTime meetingTime;
+        private Optional<MeetingTime> meetingTime = Optional.empty();
         private Set<Tag> tags;
 
         public EditPersonDescriptor() {
@@ -168,7 +171,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags) || meetingTime.isPresent();
         }
 
         public Optional<Name> getName() {
@@ -204,10 +207,10 @@ public void setAddress(Address address) {
         }
 
         public Optional<MeetingTime> getMeetingTime() {
-            return Optional.ofNullable(meetingTime);
+            return meetingTime;
         }
 
-        public void setMeetingTime(MeetingTime meetingTime) {
+        public void setMeetingTime(Optional<MeetingTime> meetingTime) {
             this.meetingTime = meetingTime;
         }
 
@@ -244,6 +247,7 @@ public boolean equals(Object other) {
                     && Objects.equals(phone, otherEditPersonDescriptor.phone)
                     && Objects.equals(email, otherEditPersonDescriptor.email)
                     && Objects.equals(address, otherEditPersonDescriptor.address)
+                    && Objects.equals(meetingTime, otherEditPersonDescriptor.meetingTime)
                     && Objects.equals(tags, otherEditPersonDescriptor.tags);
         }
 
@@ -254,6 +258,7 @@ public String toString() {
                     .add("phone", phone)
                     .add("email", email)
                     .add("address", address)
+                    .add("meetingTime", meetingTime)
                     .add("tags", tags)
                     .toString();
         }
diff --git a/src/main/java/seedu/address/logic/parser/AddClientCommandParser.java b/src/main/java/seedu/address/logic/parser/AddClientCommandParser.java
index 6a537350fdd..0f2bb91ded5 100644
--- a/src/main/java/seedu/address/logic/parser/AddClientCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddClientCommandParser.java
@@ -8,6 +8,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -36,8 +37,7 @@ public AddClientCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
                         PREFIX_ADDRESS, PREFIX_MEETING_TIME, PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE,
-                PREFIX_EMAIL, PREFIX_MEETING_TIME) //TODO: remove prefix_meeting_time here
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddClientCommand.MESSAGE_USAGE));
         }
@@ -48,7 +48,9 @@ public AddClientCommand parse(String args) throws ParseException {
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        MeetingTime meetingTime = ParserUtil.parseMeetingTime(argMultimap.getValue(PREFIX_MEETING_TIME).get());
+        Optional<MeetingTime> meetingTime = argMultimap.getValue(PREFIX_MEETING_TIME).isPresent()
+                ? Optional.of(ParserUtil.parseMeetingTime(argMultimap.getValue(PREFIX_MEETING_TIME).get()))
+                : Optional.empty();
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
         // TODO: temporary fix, implement add Client and Lead commands
diff --git a/src/main/java/seedu/address/logic/parser/AddLeadCommandParser.java b/src/main/java/seedu/address/logic/parser/AddLeadCommandParser.java
index 6cb15e7b882..371232c2d36 100644
--- a/src/main/java/seedu/address/logic/parser/AddLeadCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddLeadCommandParser.java
@@ -8,6 +8,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -41,12 +42,15 @@ public AddLeadCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddLeadCommand.MESSAGE_USAGE));
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+                PREFIX_ADDRESS, PREFIX_MEETING_TIME);
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        MeetingTime meetingTime = ParserUtil.parseMeetingTime(argMultimap.getValue(PREFIX_MEETING_TIME).get());
+        Optional<MeetingTime> meetingTime = argMultimap.getValue(PREFIX_MEETING_TIME).isPresent()
+                ? Optional.of(ParserUtil.parseMeetingTime(argMultimap.getValue(PREFIX_MEETING_TIME).get()))
+                : Optional.empty();
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
         // TODO: temporary fix, implement add Client and Lead commands
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
index 46b3309a78b..1306876233a 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -4,6 +4,7 @@
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEETING_TIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
@@ -32,7 +33,8 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+                        PREFIX_ADDRESS, PREFIX_MEETING_TIME, PREFIX_TAG);
 
         Index index;
 
@@ -42,7 +44,8 @@ public EditCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+                PREFIX_MEETING_TIME, PREFIX_ADDRESS);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
 
@@ -58,6 +61,10 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
             editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
         }
+        if (argMultimap.getValue(PREFIX_MEETING_TIME).isPresent()) {
+            editPersonDescriptor.setMeetingTime(
+                    Optional.of(ParserUtil.parseMeetingTime(argMultimap.getValue(PREFIX_MEETING_TIME).get())));
+        }
         parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
 
         if (!editPersonDescriptor.isAnyFieldEdited()) {
diff --git a/src/main/java/seedu/address/model/person/Client.java b/src/main/java/seedu/address/model/person/Client.java
index 3dde120de92..da0b34b8687 100644
--- a/src/main/java/seedu/address/model/person/Client.java
+++ b/src/main/java/seedu/address/model/person/Client.java
@@ -1,5 +1,6 @@
 package seedu.address.model.person;
 
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.model.tag.Tag;
@@ -13,7 +14,8 @@ public class Client extends Person {
     /**
      * Every field must be present and not null.
      */
-    public Client(Name name, Phone phone, Email email, Address address, MeetingTime meetingTime, Set<Tag> tags) {
+    public Client(Name name, Phone phone, Email email, Address address,
+                  Optional<MeetingTime> meetingTime, Set<Tag> tags) {
         super(name, phone, email, new Type(TYPE_CLIENT), address, meetingTime, tags);
     }
 
diff --git a/src/main/java/seedu/address/model/person/Lead.java b/src/main/java/seedu/address/model/person/Lead.java
index f166ca6c82e..7cac3b65b4d 100644
--- a/src/main/java/seedu/address/model/person/Lead.java
+++ b/src/main/java/seedu/address/model/person/Lead.java
@@ -1,5 +1,6 @@
 package seedu.address.model.person;
 
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.model.tag.Tag;
@@ -13,7 +14,8 @@ public class Lead extends Person {
     /**
      * Every field must be present and not null.
      */
-    public Lead(Name name, Phone phone, Email email, Address address, MeetingTime meetingTime, Set<Tag> tags) {
+    public Lead(Name name, Phone phone, Email email, Address address,
+                Optional<MeetingTime> meetingTime, Set<Tag> tags) {
         super(name, phone, email, new Type(TYPE_LEAD), address, meetingTime, tags);
     }
 
diff --git a/src/main/java/seedu/address/model/person/MeetingTime.java b/src/main/java/seedu/address/model/person/MeetingTime.java
index dc1310255dc..4968418d281 100644
--- a/src/main/java/seedu/address/model/person/MeetingTime.java
+++ b/src/main/java/seedu/address/model/person/MeetingTime.java
@@ -1,6 +1,5 @@
 package seedu.address.model.person;
 
-import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.AppUtil.checkArgument;
 import static seedu.address.model.person.MeetingTimeFormatter.DATE_TIME_FORMAT;
 
@@ -22,7 +21,6 @@ public class MeetingTime {
      * @param meetingTime A valid meeting time.
      */
     public MeetingTime(String meetingTime) {
-        requireNonNull(meetingTime);
         checkArgument(isValidMeetingTime(meetingTime), MESSAGE_CONSTRAINTS);
         this.value = MeetingTimeFormatter.parse(meetingTime);
     }
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
index 50885bb4176..f6333bbd4f7 100644
--- a/src/main/java/seedu/address/model/person/Person.java
+++ b/src/main/java/seedu/address/model/person/Person.java
@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.commons.util.ToStringBuilder;
@@ -24,14 +25,14 @@ public abstract class Person {
 
     // Data fields
     private final Address address;
-    private final MeetingTime meetingTime;
+    private final Optional<MeetingTime> meetingTime;
     private final Set<Tag> tags = new HashSet<>();
 
     /**
      * Every field must be present and not null.
      */
     public Person(Name name, Phone phone, Email email, Type type,
-                  Address address, MeetingTime meetingTime, Set<Tag> tags) {
+                  Address address, Optional<MeetingTime> meetingTime, Set<Tag> tags) {
         requireAllNonNull(name, phone, email, address, meetingTime, tags);
         this.name = name;
         this.phone = phone;
@@ -62,9 +63,17 @@ public Address getAddress() {
         return address;
     }
 
-    public MeetingTime getMeetingTime() {
+    public Optional<MeetingTime> getMeetingTime() {
         return meetingTime;
     }
+    public String getMeetingTimeString() {
+        return meetingTime.map(MeetingTime::toString).orElse(null);
+    }
+
+    public String getMeetingTimeStringForUserInterface() {
+        return meetingTime.map(meetingTime -> "Meeting on: " + meetingTime)
+                .orElse(null);
+    }
 
     /**
      * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 410bead41f1..64e22b2b0b1 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -1,6 +1,7 @@
 package seedu.address.model.util;
 
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -23,22 +24,25 @@ public class SampleDataUtil {
     public static Person[] getSamplePersons() {
         return new Person[] {
             new Client(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
-                new Address("Blk 30 Geylang Street 29, #06-40"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 30 Geylang Street 29, #06-40"), Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("friends")),
             new Client(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
-                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
+                    Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("colleagues", "friends")),
             new Client(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
-                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
+                    Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("neighbours")),
             new Lead(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
-                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
+                    Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("family")),
             new Lead(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
-                new Address("Blk 47 Tampines Street 20, #17-35"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 47 Tampines Street 20, #17-35"), Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("classmates")),
             new Lead(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
-                new Address("Blk 45 Aljunied Street 85, #11-31"), new MeetingTime("10/10/2023 14:30"),
+                new Address("Blk 45 Aljunied Street 85, #11-31"), Optional.of(new MeetingTime("10/10/2023 14:30")),
                 getTagSet("colleagues"))
         };
     }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
index fe93ede985f..6f7ba2f93ea 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -36,7 +37,7 @@ class JsonAdaptedPerson {
     private final String email;
     private final String type;
     private final String address;
-    private final String meetingTime;
+    private String meetingTime;
     private final List<JsonAdaptedTag> tags = new ArrayList<>();
 
     /**
@@ -52,7 +53,9 @@ public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone
         this.email = email;
         this.type = type;
         this.address = address;
-        this.meetingTime = meetingTime;
+        if (meetingTime != null) {
+            this.meetingTime = meetingTime;
+        }
         if (tags != null) {
             this.tags.addAll(tags);
         }
@@ -67,7 +70,7 @@ public JsonAdaptedPerson(Person source) {
         email = source.getEmail().value;
         address = source.getAddress().value;
         type = source.getType().value;
-        meetingTime = source.getMeetingTime().toString();
+        meetingTime = source.getMeetingTime().map(MeetingTime::toString).orElse(null);
         tags.addAll(source.getTags().stream()
                 .map(JsonAdaptedTag::new)
                 .collect(Collectors.toList()));
@@ -116,14 +119,15 @@ public Person toModelType() throws IllegalValueException {
         }
         final Address modelAddress = new Address(address);
 
+        final Optional<MeetingTime> modelMeetingTime;
         if (meetingTime == null) {
-            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
-                    MeetingTime.class.getSimpleName()));
-        }
-        if (!MeetingTime.isValidMeetingTime(meetingTime)) {
-            throw new IllegalValueException(MeetingTime.MESSAGE_CONSTRAINTS);
+            modelMeetingTime = Optional.empty();
+        } else {
+            if (!MeetingTime.isValidMeetingTime(meetingTime)) {
+                throw new IllegalValueException(MeetingTime.MESSAGE_CONSTRAINTS);
+            }
+            modelMeetingTime = Optional.of(new MeetingTime(meetingTime));
         }
-        final MeetingTime modelMeetingTime = new MeetingTime(meetingTime);
 
         final Set<Tag> modelTags = new HashSet<>(personTags);
 
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
index e5f2869ecac..c9f43a8e0bf 100644
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ b/src/main/java/seedu/address/ui/PersonCard.java
@@ -53,7 +53,10 @@ public PersonCard(Person person, int displayedIndex) {
         name.setText(person.getName().fullName);
         phone.setText(person.getPhone().value);
         address.setText(person.getAddress().value);
-        meetingTime.setText("Meeting on: " + person.getMeetingTime().toString());
+        if (person.getMeetingTime().isPresent()) {
+            meetingTime.setManaged(true);
+            meetingTime.setText(person.getMeetingTimeStringForUserInterface());
+        }
         email.setText(person.getEmail().value);
 
         Label label = new Label(person.getType().value);
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index 6cd111e0c1d..3d044bb9007 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -28,7 +28,7 @@
         <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
       </HBox>
       <FlowPane fx:id="tags" />
-      <Label fx:id="meetingTime" styleClass="cell_small_label" text="\$meetingTime" />
+      <Label fx:id="meetingTime" styleClass="cell_small_label" text="\$meetingTime" managed="false" />
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
       <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 6e98c3b4719..ad762ebdb8a 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -6,7 +6,7 @@
     "email" : "alice@example.com",
     "type": "client",
     "address" : "123, Jurong West Ave 6, #08-111",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : [ "friends" ]
   }, {
     "name" : "Benson Meier",
@@ -14,7 +14,7 @@
     "email" : "johnd@example.com",
     "type": "client",
     "address" : "311, Clementi Ave 2, #02-25",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : "12/12/2020 12:00",
     "tags" : [ "owesMoney", "friends" ]
   }, {
     "name" : "Carl Kurz",
@@ -22,7 +22,7 @@
     "email" : "heinz@example.com",
     "type": "client",
     "address" : "wall street",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : []
   }, {
     "name" : "Daniel Meier",
@@ -30,7 +30,7 @@
     "email" : "cornelia@example.com",
     "type": "client",
     "address" : "10th street",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : [ "friends" ]
   }, {
     "name" : "Elle Meyer",
@@ -38,7 +38,7 @@
     "email" : "werner@example.com",
     "type": "lead",
     "address" : "michegan ave",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : []
   }, {
     "name" : "Fiona Kunz",
@@ -46,7 +46,7 @@
     "email" : "lydia@example.com",
     "type": "lead",
     "address" : "little tokyo",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : []
   }, {
     "name" : "George Best",
@@ -54,7 +54,7 @@
     "email" : "anna@example.com",
     "type": "lead",
     "address" : "4th street",
-    "meetingTime" : "10/10/2023 14:30",
+    "meetingTime" : null,
     "tags" : []
   } ]
 }
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index 513a6279e0f..0419b50e941 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -69,10 +69,10 @@ public class CommandTestUtil {
     static {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
                 .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
-                .withTags(VALID_TAG_FRIEND).build();
+                .withMeetingTime(VALID_MEETING_TIME_AMY).withTags(VALID_TAG_FRIEND).build();
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
                 .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
-                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+                .withMeetingTime(VALID_MEETING_TIME_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
     }
 
     /**
diff --git a/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java b/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java
index fd45b9556be..4c025ff8c6b 100644
--- a/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java
@@ -37,7 +37,7 @@ public void constructorNullPersonThrowsNullPointerException() {
     public void executeClientConvertToLeadSuccess() throws CommandException {
         final String expectedOutput = "Converted Client to Lead: Amy Bee; Phone: 85355255; Email: amy@gmail.com; "
                 + "Address: 123, Jurong West Ave 6, #08-111; "
-                + "Meeting Time: 10/10/2023 14:30; Tags: ";
+                + "Meeting Time: null; Tags: ";
 
         // Step 1: Set up the necessary test data and model stub.
         ModelStubAcceptingClientAdded modelStub = new ModelStubAcceptingClientAdded();
diff --git a/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java b/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java
index eb412d5d575..b2829bf6f71 100644
--- a/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java
@@ -37,7 +37,7 @@ public void constructor_nullPerson_throwsNullPointerException() {
     public void executeLeadConvertToClientAddSuccessfully() throws CommandException {
         final String expectedOutput = "Converted Lead to Client: Amy Bee; Phone: 85355255; "
                 + "Email: amy@gmail.com; Address: 123, Jurong West Ave 6, #08-111; "
-                + "Meeting Time: 10/10/2023 14:30; Tags: ";
+                + "Meeting Time: null; Tags: ";
         // Step 1: Set up the necessary test data and model stub.
         ModelStubAcceptingLeadAdded modelStub = new ModelStubAcceptingLeadAdded();
         Lead validPerson = new PersonBuilder().buildLead();
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
index b17c1f3d5c2..25533f5877f 100644
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
@@ -7,6 +7,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEETING_TIME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
@@ -52,6 +53,10 @@ public void equals() {
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
 
+        // different meeting time -> returns false
+        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withMeetingTime(VALID_MEETING_TIME_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
         // different tags -> returns false
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
         assertFalse(DESC_AMY.equals(editedAmy));
@@ -64,7 +69,8 @@ public void toStringMethod() {
                 + editPersonDescriptor.getName().orElse(null) + ", phone="
                 + editPersonDescriptor.getPhone().orElse(null) + ", email="
                 + editPersonDescriptor.getEmail().orElse(null) + ", address="
-                + editPersonDescriptor.getAddress().orElse(null) + ", tags="
+                + editPersonDescriptor.getAddress().orElse(null) + ", meetingTime="
+                + editPersonDescriptor.getMeetingTime() + ", tags="
                 + editPersonDescriptor.getTags().orElse(null) + "}";
         assertEquals(expected, editPersonDescriptor.toString());
     }
diff --git a/src/test/java/seedu/address/logic/parser/AddClientCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddClientCommandParserTest.java
index dfc661e4baf..67059b24c62 100644
--- a/src/test/java/seedu/address/logic/parser/AddClientCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddClientCommandParserTest.java
@@ -142,6 +142,12 @@ public void parse_optionalFieldsMissing_success() {
         assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY
                         + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + MEETING_TIME_DESC_AMY,
                 new AddClientCommand(expectedClient));
+
+        // no meeting time
+        Client expectedClient2 = new PersonBuilder(BOB).withMeetingTime(null).buildClient();
+        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB
+                        + EMAIL_DESC_BOB + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND,
+                new AddClientCommand(expectedClient2));
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/parser/AddLeadCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddLeadCommandParserTest.java
index 29ac346f039..1387db77826 100644
--- a/src/test/java/seedu/address/logic/parser/AddLeadCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddLeadCommandParserTest.java
@@ -28,6 +28,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEETING_TIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
@@ -91,9 +92,11 @@ public void parse_repeatedNonTagValue_failure() {
 
         // multiple fields repeated
         assertParseFailure(parser,
-                validExpectedPersonString + PHONE_DESC_AMY + EMAIL_DESC_AMY + NAME_DESC_AMY + ADDRESS_DESC_AMY
+                validExpectedPersonString + PHONE_DESC_AMY + EMAIL_DESC_AMY
+                        + NAME_DESC_AMY + ADDRESS_DESC_AMY + MEETING_TIME_DESC_BOB
                         + validExpectedPersonString,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_NAME, PREFIX_ADDRESS, PREFIX_EMAIL, PREFIX_PHONE));
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_NAME, PREFIX_ADDRESS,
+                        PREFIX_MEETING_TIME, PREFIX_EMAIL, PREFIX_PHONE));
 
         // invalid value followed by valid value
 
@@ -138,6 +141,12 @@ public void parse_optionalFieldsMissing_success() {
         Lead expectedLead = new PersonBuilder(AMY).withTags().buildLead();
         assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
                         + ADDRESS_DESC_AMY + MEETING_TIME_DESC_AMY, new AddLeadCommand(expectedLead));
+
+        // no meeting time
+        Lead expectedLead2 = new PersonBuilder(BOB).withMeetingTime(null).buildLead();
+        assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB
+                        + EMAIL_DESC_BOB + ADDRESS_DESC_BOB + TAG_DESC_FRIEND + TAG_DESC_HUSBAND,
+                new AddLeadCommand(expectedLead2));
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
index cc7175172d4..6475c41d517 100644
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
@@ -10,6 +10,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
 import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.MEETING_TIME_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
@@ -17,6 +18,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEETING_TIME_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
@@ -106,12 +108,12 @@ public void parse_invalidValue_failure() {
     @Test
     public void parse_allFieldsSpecified_success() {
         Index targetIndex = INDEX_SECOND_PERSON;
-        String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
-                + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
+        String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY + ADDRESS_DESC_AMY
+                + MEETING_TIME_DESC_AMY + NAME_DESC_AMY + TAG_DESC_HUSBAND + TAG_DESC_FRIEND;
 
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
                 .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
-                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+                .withMeetingTime(VALID_MEETING_TIME_AMY).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
         EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
 
         assertParseSuccess(parser, userInput, expectedCommand);
@@ -156,6 +158,12 @@ public void parse_oneFieldSpecified_success() {
         expectedCommand = new EditCommand(targetIndex, descriptor);
         assertParseSuccess(parser, userInput, expectedCommand);
 
+        // meeting time
+        userInput = targetIndex.getOneBased() + MEETING_TIME_DESC_AMY;
+        descriptor = new EditPersonDescriptorBuilder().withMeetingTime(VALID_MEETING_TIME_AMY).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
         // tags
         userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
         descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
index ec1f89e6c60..069bddf2107 100644
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
@@ -14,6 +15,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
+import static seedu.address.testutil.TypicalPersons.BENSON;
 import static seedu.address.testutil.TypicalPersons.BOB;
 
 import org.junit.jupiter.api.Test;
@@ -141,4 +143,15 @@ public void toStringMethod() {
                 + ", tags=" + ALICE.getTags() + "}";
         assertEquals(expected, ALICE.toString());
     }
+
+    @Test
+    public void getMeetingTimeStringForUserInterface() {
+        // non-empty meeting time
+        String expected = "Meeting on: " + BENSON.getMeetingTime().get();
+        assertEquals(expected, BENSON.getMeetingTimeStringForUserInterface());
+
+        // empty meeting time
+        Person person = new PersonBuilder(ALICE).withMeetingTime(null).buildClient();
+        assertNull(person.getMeetingTimeStringForUserInterface());
+    }
 }
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
index 34d31f284c0..945ea347608 100644
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
@@ -4,6 +4,7 @@
 import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.BENSON;
+import static seedu.address.testutil.TypicalPersons.BENSON_NO_MEETING_TIME;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +44,14 @@ public void toModelType_validPersonDetails_returnsPerson() throws Exception {
         assertEquals(BENSON, person.toModelType());
     }
 
+    @Test
+    public void toModelType_nullMeetingTimeWithOtherPersonDetailsValid_returnsPerson() throws Exception {
+        JsonAdaptedPerson person =
+                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_TYPE,
+                        VALID_ADDRESS, null, VALID_TAGS);
+        assertEquals(BENSON_NO_MEETING_TIME, person.toModelType());
+    }
+
     @Test
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedPerson person =
@@ -145,13 +154,4 @@ public void toModelType_invalidMeetingTime_throwsIllegalValueException() {
         String expectedMessage = MeetingTime.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
-
-    @Test
-    public void toModelType_nullMeetingTime_throwsIllegalValueException() {
-        JsonAdaptedPerson person =
-                new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_TYPE,
-                        VALID_ADDRESS, null, VALID_TAGS);
-        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, MeetingTime.class.getSimpleName());
-        assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
-    }
 }
diff --git a/src/test/java/seedu/address/testutil/ClientUtil.java b/src/test/java/seedu/address/testutil/ClientUtil.java
index e401cf6c233..0e0aad8901e 100644
--- a/src/test/java/seedu/address/testutil/ClientUtil.java
+++ b/src/test/java/seedu/address/testutil/ClientUtil.java
@@ -31,7 +31,8 @@ private static String getClientDetails(Client client) {
         sb.append(PREFIX_PHONE + client.getPhone().value + " ");
         sb.append(PREFIX_EMAIL + client.getEmail().value + " ");
         sb.append(PREFIX_ADDRESS + client.getAddress().value + " ");
-        sb.append(PREFIX_MEETING_TIME + client.getMeetingTime().toString() + " ");
+        client.getMeetingTime().ifPresent(meetingTime -> sb.append(PREFIX_MEETING_TIME
+                + meetingTime.toString() + " "));
         client.getTags().stream().forEach(
                 s -> sb.append(PREFIX_TAG + s.tagName + " ")
         );
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
index 4584bd5044e..3bed347e88e 100644
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
@@ -1,5 +1,6 @@
 package seedu.address.testutil;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -7,6 +8,7 @@
 import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
+import seedu.address.model.person.MeetingTime;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
@@ -36,6 +38,7 @@ public EditPersonDescriptorBuilder(Person person) {
         descriptor.setPhone(person.getPhone());
         descriptor.setEmail(person.getEmail());
         descriptor.setAddress(person.getAddress());
+        descriptor.setMeetingTime(person.getMeetingTime());
         descriptor.setTags(person.getTags());
     }
 
@@ -71,6 +74,14 @@ public EditPersonDescriptorBuilder withAddress(String address) {
         return this;
     }
 
+    /**
+     * Sets the {@code MeetingTime} of the {@code EditPersonDescriptor} that we are building.
+     */
+    public EditPersonDescriptorBuilder withMeetingTime(String meetingTime) {
+        descriptor.setMeetingTime(Optional.of(new MeetingTime(meetingTime)));
+        return this;
+    }
+
     /**
      * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code EditPersonDescriptor}
      * that we are building.
diff --git a/src/test/java/seedu/address/testutil/LeadUtil.java b/src/test/java/seedu/address/testutil/LeadUtil.java
index d1d147f001c..44214b87598 100644
--- a/src/test/java/seedu/address/testutil/LeadUtil.java
+++ b/src/test/java/seedu/address/testutil/LeadUtil.java
@@ -31,7 +31,8 @@ private static String getLeadDetails(Lead lead) {
         sb.append(PREFIX_PHONE + lead.getPhone().value + " ");
         sb.append(PREFIX_EMAIL + lead.getEmail().value + " ");
         sb.append(PREFIX_ADDRESS + lead.getAddress().value + " ");
-        sb.append(PREFIX_MEETING_TIME + lead.getMeetingTime().toString() + " ");
+        lead.getMeetingTime().ifPresent(meetingTime -> sb.append(PREFIX_MEETING_TIME
+                + meetingTime.toString() + " "));
         lead.getTags().stream().forEach(
                 s -> sb.append(PREFIX_TAG + s.tagName + " ")
         );
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
index 7ce59d50d15..57ed978572a 100644
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ b/src/test/java/seedu/address/testutil/PersonBuilder.java
@@ -1,6 +1,7 @@
 package seedu.address.testutil;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.model.person.Address;
@@ -23,14 +24,13 @@ public class PersonBuilder {
     public static final String DEFAULT_PHONE = "85355255";
     public static final String DEFAULT_EMAIL = "amy@gmail.com";
     public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
-    public static final String DEFAULT_MEETING_TIME = "10/10/2023 14:30";
 
     private Name name;
     private Phone phone;
     private Email email;
     private Address address;
     private Set<Tag> tags;
-    private MeetingTime meetingTime;
+    private Optional<MeetingTime> meetingTime;
 
     /**
      * Creates a {@code PersonBuilder} with the default details.
@@ -40,7 +40,7 @@ public PersonBuilder() {
         phone = new Phone(DEFAULT_PHONE);
         email = new Email(DEFAULT_EMAIL);
         address = new Address(DEFAULT_ADDRESS);
-        meetingTime = new MeetingTime(DEFAULT_MEETING_TIME);
+        meetingTime = Optional.empty();
         tags = new HashSet<>();
     }
 
@@ -100,7 +100,11 @@ public PersonBuilder withEmail(String email) {
      * Sets the {@code MeetingTime} of the {@code Person} that we are building.
      */
     public PersonBuilder withMeetingTime(String meetingTime) {
-        this.meetingTime = new MeetingTime(meetingTime);
+        if (meetingTime == null) {
+            this.meetingTime = Optional.empty();
+            return this;
+        }
+        this.meetingTime = Optional.of(new MeetingTime(meetingTime));
         return this;
     }
 
diff --git a/src/test/java/seedu/address/testutil/TypicalLeads.java b/src/test/java/seedu/address/testutil/TypicalLeads.java
index ec55ca808a7..2f49e3b1d1e 100644
--- a/src/test/java/seedu/address/testutil/TypicalLeads.java
+++ b/src/test/java/seedu/address/testutil/TypicalLeads.java
@@ -51,7 +51,7 @@ public class TypicalLeads {
     // Manually added
     public static final Lead HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
             .withEmail("stefan@example.com").withAddress("little india")
-            .withMeetingTime("24/10/2023 12:30").buildLead();
+            .withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND).buildLead();
     public static final Lead IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
             .withEmail("hans@example.com").withAddress("chicago ave").withMeetingTime("24/10/2023 12:30").buildLead();
 
@@ -61,7 +61,8 @@ public class TypicalLeads {
             .withTags(VALID_TAG_FRIEND).withMeetingTime(VALID_MEETING_TIME_AMY).buildLead();
     public static final Lead BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
             .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
-            .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).withMeetingTime(VALID_MEETING_TIME_BOB).buildLead();
+            .withMeetingTime(VALID_MEETING_TIME_BOB)
+            .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).buildLead();
 
     public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
 
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index 88b5c251f6b..566e333eada 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -27,9 +27,13 @@ public class TypicalPersons {
 
     public static final Client ALICE = new PersonBuilder().withName("Alice Pauline")
             .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
-            .withPhone("94351253")
-            .withTags("friends").buildClient();
+            .withPhone("94351253").withTags("friends").buildClient();
     public static final Client BENSON = new PersonBuilder().withName("Benson Meier")
+            .withAddress("311, Clementi Ave 2, #02-25")
+            .withEmail("johnd@example.com").withPhone("98765432")
+            .withMeetingTime("12/12/2020 12:00")
+            .withTags("owesMoney", "friends").buildClient();
+    public static final Client BENSON_NO_MEETING_TIME = new PersonBuilder().withName("Benson Meier")
             .withAddress("311, Clementi Ave 2, #02-25")
             .withEmail("johnd@example.com").withPhone("98765432")
             .withTags("owesMoney", "friends").buildClient();