diff --git a/client/src/components/task-list/task-list.container.jsx b/client/src/components/task-list/task-list.container.jsx
index c36d660b8..1c01d381d 100644
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -38,7 +38,13 @@ export function TaskListContainer({
 }) {
   const { t } = useTranslation();
   const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder, deleted, completed, mine } = searchParams;
+  const {
+    page,
+    sortcolumn,
+    sortorder,
+    deleted,
+    completed //mine
+  } = searchParams;
   const dispatch = useDispatch();
 
   const { loading, error, data, refetch } = useQuery(query[Object.keys(query)[0]], {
diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
index 356c59f15..f5a5862cb 100644
--- a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
@@ -270,7 +270,7 @@ export function TaskUpsertModalComponent({
             rules={[
               {
                 validator: (_, value) => {
-                  if (!value || existingTask?.remind_at === value || dayjs(value).isAfter(dayjs().add(30, "minute"))) {
+                  if (!value || existingTask?.remind_at === value || dayjs(value).isAfter(dayjs().add(15, "minute"))) {
                     return Promise.resolve();
                   }
                   return Promise.reject(new Error(t("tasks.validation.remind_at_error_message")));
diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js
index 913540ef9..595665fe0 100644
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -202,7 +202,7 @@ const tasksRemindEmail = async (req, res) => {
 
     // Group tasks by assigned_to, to avoid sending multiple emails to the same recipient.
     const groupedTasks = tasksRequest.tasks.reduce((acc, task) => {
-      const key = task.assigned_to_email.user_email;
+      const key = task.assigned_to_employee.user_email;
       if (!acc[key]) {
         acc[key] = [];
       }