diff --git a/src/routes/CreateNewTeam/components/EditRoleForm/index.jsx b/src/routes/CreateNewTeam/components/EditRoleForm/index.jsx
index 475c8a0..dfb98ca 100644
--- a/src/routes/CreateNewTeam/components/EditRoleForm/index.jsx
+++ b/src/routes/CreateNewTeam/components/EditRoleForm/index.jsx
@@ -30,7 +30,6 @@ const Error = ({ name }) => {
 };
 
 function EditRoleForm({ onChange, role }) {
-  const [startMonthVisible, setStartMonthVisible] = useState(false);
   const onRoleChange = (state) => {
     if (state.hasValidationErrors) {
       onChange(false);
@@ -121,9 +120,9 @@ function EditRoleForm({ onChange, role }) {
                   <Error name="durationWeeks" />
                 </td>
                 <td>
-                  {startMonthVisible ? (
+                  {role.startMonth ? (
                     <>
-                      <Field name="startMonth" initialValue={Date.now()}>
+                      <Field name="startMonth" initialValue={role.startMonth}>
                         {(props) => (
                           <MonthPicker
                             name={props.input.name}
@@ -143,7 +142,9 @@ function EditRoleForm({ onChange, role }) {
                     <div styleName="flex-container">
                       <button
                         styleName="toggle-button"
-                        onClick={() => setStartMonthVisible(true)}
+                        onClick={() =>
+                          onRoleChange({ values: { startMonth: Date.now() } })
+                        }
                       >
                         Add Start Month
                       </button>
diff --git a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
index 83d321a..327491f 100644
--- a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
+++ b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
@@ -148,9 +148,9 @@ function SubmitContainer({
               .then(() => {
                 setTimeout(() => {
                   dispatch(clearSearchedRoles());
-                  // Backend api create project has sync issue, so delay 2 seconds
+                  // Backend api create project has sync issue, so delay 4 seconds
                   navigate("/taas/myteams");
-                }, 2000);
+                }, 4000);
               })
               .catch((err) => {
                 setRequestLoading(false);