diff --git a/frontend/src/Login.jsx b/frontend/src/Login.jsx
index 58f63b1..4690e4d 100644
--- a/frontend/src/Login.jsx
+++ b/frontend/src/Login.jsx
@@ -57,7 +57,14 @@ const Login = () => {
 
   return (
     <div className={styles.login_container}>
-      <div className={styles.login}>
+      <div
+        className={styles.login}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" && name && password) {
+            handleLogin();
+          }
+        }}
+      >
         <h1 className={styles.pirocheck}>PIROCHECK</h1>
 
         <InputBlock
@@ -71,7 +78,7 @@ const Login = () => {
               placeholder: "비밀번호",
             },
           ]}
-          values={[name, password]} // InputBlock props 수정에 따라 추가
+          values={[name, password]}
           onChange={handleChange}
         />
         <div className={styles.errorWrapper}>
diff --git a/frontend/src/components/TaskModal.jsx b/frontend/src/components/TaskModal.jsx
index a1d9879..a2e7a42 100644
--- a/frontend/src/components/TaskModal.jsx
+++ b/frontend/src/components/TaskModal.jsx
@@ -18,18 +18,32 @@ const TaskModal = ({ weekInfo, onClose }) => {
   };
 
   const handleSave = async () => {
-    const requests = taskList.map((task, index) =>
-      api.post("/admin/assignment/signup", {
+    console.log("save clicked");
+
+    const weekNumber = parseInt(weekInfo.week.replace("주차", "")); // 주차 숫자 정보만 추출
+    const filteredTasks = taskList.filter((t) => t.trim() !== ""); // 빈 값 제거
+
+    const requests = filteredTasks.map((task, index) => {
+      console.log("sending:", {
+        subject: topic,
+        assignmentName: task,
+        week: weekNumber,
+        day: day,
+        orderNumber: index + 1,
+      });
+
+      return api.post("/admin/assignment/signup", {
         subject: topic,
         assignmentName: task,
-        week: parseInt(weekInfo.week),
+        week: weekNumber,
         day: day,
         orderNumber: index + 1,
-      })
-    );
+      });
+    });
 
     try {
-      await Promise.all(requests);
+      const response = await Promise.all(requests);
+      console.log("응답들: ", response);
       alert("과제가 저장되었습니다.");
       onClose();
     } catch (error) {