diff --git a/src/client/src/TournamentCreator.js b/src/client/src/TournamentCreator.js
index 4acc3b5..850be68 100644
--- a/src/client/src/TournamentCreator.js
+++ b/src/client/src/TournamentCreator.js
@@ -75,12 +75,15 @@ function TournamentForm(props) {
     setMaxTeamsExponent(event.target.value);
   }
 
+  const [startTime, setStartTime] = React.useState([new Date(), null]);
+  const [endTime, setEndTime] = React.useState([new Date(), null]);
+
   function submitTournament(event) {
     event.preventDefault();
     console.log(maxTeamsExponent)
     let maxTeams = Math.pow(2, maxTeamsExponent);
-    let startTime = new Date(document.getElementById("startDatePicker").value).toUTCString();
-    let endTime = new Date(document.getElementById("endDatePicker").value).toUTCString();
+    let startTime = new Date(startTime).toUTCString();
+    let endTime = new Date(endTime).toUTCString();
     postTournament(
       props.showError,
       document.getElementById("nameInput").value,
@@ -101,9 +104,6 @@ function TournamentForm(props) {
     {  value: 7,  label: "128",}
   ];
 
-  const [startValue, setStartValue] = React.useState(new Date());
-  const [endValue, setEndValue] = React.useState(new Date());
-
   return (
     <>
     <form>
@@ -121,9 +121,9 @@ function TournamentForm(props) {
               mask="____-__-__ __:__"
               format="yyyy-MM-dd HH:mm"
               inputFormat="yyyy-MM-dd HH:mm"
-              value={startValue}
+              value={startTime}
               onChange={(newValue) => {
-                setStartValue(newValue);
+                setStartTime(newValue);
                 console.log(new Date(newValue).toUTCString());
               }}
               renderInput={(params) => <TextField id="startDatePicker" {...params} />}
@@ -137,9 +137,9 @@ function TournamentForm(props) {
               mask="____-__-__ __:__"
               format="yyyy-MM-dd HH:mm"
               inputFormat="yyyy-MM-dd HH:mm"
-              value={endValue}
+              value={endTime}
               onChange={(newValue) => {
-                setEndValue(newValue);
+                setEndTime(newValue);
                 console.log(new Date(newValue).toUTCString());
               }}
               renderInput={(params) => <TextField id="endDatePicker" {...params} />}
diff --git a/src/client/src/TournamentManager.js b/src/client/src/TournamentManager.js
index a249ce5..e7be1ef 100644
--- a/src/client/src/TournamentManager.js
+++ b/src/client/src/TournamentManager.js
@@ -101,7 +101,12 @@ let deleteTournament = tournamentId => event => {
     })
     .catch((error) => showError(error));
 }
+
 function ManageTournament(props) {
+
+  const [startTime, setStartTime] = React.useState([new Date(),null]);
+  const [endTime, setEndTime] = React.useState([new Date(),null]);
+  
   React.useEffect(() => {
     fetch(
       process.env.REACT_APP_API_URL + `/tournament/${props.tournamentId}`
@@ -111,18 +116,14 @@ function ManageTournament(props) {
         if (data.status !== "OK") {
           showError(data.data);
         }
+        
         document.getElementById("editName").value = data.data.name;
         document.getElementById("editDesc").value = data.data.description;
-        document.getElementById("editStartDate").value = data.data.startTime.slice(0, 16);
-        document.getElementById("editEndDate").value = data.data.endTime.slice(0, 16);
-        console.log(data.data.endTime);
-        console.log(data.data.endTime.slice(0, 16));
+        setStartTime(data.data.startTime.slice(0, 16));
+        setEndTime(data.data.endTime.slice(0, 16));
       })
       .catch((err) => showError(err));
-  }, []);
-  
-  const [startValue, setStartValue] = React.useState();
-  const [endValue, setEndValue] = React.useState();
+  }, [endTime, props.tournamentId, startTime]);
 
   return (
     <>
@@ -132,32 +133,18 @@ function ManageTournament(props) {
           <TextField type="text" multiline={true} id="editDesc" label="Edit Description:" placeholder="Edit Description" InputLabelProps={{shrink: true}} />
           <Box>
           <LocalizationProvider dateAdapter={AdapterDateFns}>
-            <DateTimePicker
-              label={"Start Time"}
-              inputVariant="outlined"
-              ampm={false}
-              mask="____-__-__ __:__"
-              format="yyyy-MM-dd HH:mm"
-              inputFormat="yyyy-MM-dd HH:mm"
-              value={startValue}
+            <DateTimePicker label={"Start Time"} inputVariant="outlined" ampm={false} mask="____-__-__ __:__" format="yyyy-MM-dd HH:mm" inputFormat="yyyy-MM-dd HH:mm" value={startTime}
               onChange={(newValue) => {
-                setStartValue(newValue);
+                setStartTime(newValue);
                 console.log(new Date(newValue).toUTCString());
               }}
               renderInput={(params) => <TextField id="editStartDate" {...params} />}
             />
           </LocalizationProvider>
           <LocalizationProvider dateAdapter={AdapterDateFns}>
-            <DateTimePicker
-              label={"End Time"}
-              inputVariant="outlined"
-              ampm={false}
-              mask="____-__-__ __:__"
-              format="yyyy-MM-dd HH:mm:"
-              inputFormat="yyyy-MM-dd HH:mm"
-              value={endValue}             
+            <DateTimePicker label={"End Time"} inputVariant="outlined" ampm={false} mask="____-__-__ __:__" format="yyyy-MM-dd HH:mm:" inputFormat="yyyy-MM-dd HH:mm" value={endTime}             
               onChange={(newValue) => {
-                setEndValue(newValue);
+                setEndTime(newValue);
                 console.log(new Date(newValue).toUTCString());
               }}
               renderInput={(params) => <TextField id="editEndDate" {...params} />}
@@ -169,7 +156,7 @@ function ManageTournament(props) {
 
           <Button type="submit" variant="contained" onClick={submitChanges(props.tournamentId)} color="primary" >
             Save Tournament Details
-          </Button>          
+          </Button>   
       
       </Stack>
     </form>