diff --git a/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
index 7dc1425398bf39f3df45607b18fab3617adc2125..50506eccfe7ad8ab6880a0314e55084becc6ba5a 100644
--- a/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
+++ b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
@@ -109,13 +109,6 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
     contact_person_unit: null,
     comments: null,
   })
-  // Find the role info relevant for this page
-  const getRoleInfo = () => {
-    const roleInfo = guest.roles.filter((ro) => ro.id.toString() === id)[0]
-    if (roleInfo) {
-      setRole(roleInfo)
-    }
-  }
   // Prepare min and max date values
   const today = new Date()
   const todayPlusMaxDays = addDays(role.max_days)(today)
@@ -154,10 +147,21 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
   const {
     control,
     handleSubmit,
+    setValue,
     formState: { isDirty, isValid },
-  } = useForm({ mode: 'onChange' })
+  } = useForm<RoleFormData>({ mode: 'onChange' })
   const onSubmit = handleSubmit(submit)
 
+  // Find the role info relevant for this page
+  const getRoleInfo = () => {
+    const roleInfo = guest.roles.filter((ro) => ro.id.toString() === id)[0]
+    if (roleInfo) {
+      setRole(roleInfo)
+      // Set values of date fields to current dates if role exists
+      setValue('end_date', roleInfo.end_date)
+      setValue('start_date', roleInfo.start_date)
+    }
+  }
   useEffect(() => {
     getRoleInfo()
   }, [guest])