diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php
index 5a362fb..7c3590c 100644
--- a/app/Models/UserModel.php
+++ b/app/Models/UserModel.php
@@ -102,11 +102,6 @@ class UserModel extends CommonModel
     //modify용
     public function modify(UserEntity $entity, array $formDatas): UserEntity
     {
-        //암호를 입력하지 않았을시는 변경하기 않게 하기위함
-        if (!isset($formDatas['passwd']) || $formDatas['passwd'] == "") {
-            unset($formDatas['passwd']);
-            unset($formDatas['confirmpassword']);
-        }
         return $this->modify_process($entity, $formDatas);
     }
 }
diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index b5b4909..cbb51e4 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -28,7 +28,15 @@ class UserService extends CommonService
     }
     public function modify(UserEntity $entity, array $formDatas): UserEntity
     {
-        $formDatas['role'] = implode(DEFAULTS["DELIMITER_ROLE"], $formDatas['role']);
+        //암호를 입력하지 않았을시는 변경하기 않게 하기위함
+        if (!isset($formDatas['passwd']) || $formDatas['passwd'] == "") {
+            unset($formDatas['passwd']);
+            unset($formDatas['confirmpassword']);
+        }
+        //Role을 지정이 있을경우에만 , toggle이나 batcjhjob에서는 없을수도 있으므로
+        if (isset($formDatas['role'])) {
+            $formDatas['role'] = implode(DEFAULTS["DELIMITER_ROLE"], $formDatas['role']);
+        }
         return $this->getModel()->modify($entity, $formDatas);
     }
     public function delete(): void