diff --git a/Base/Controller/BaseController.cs b/Base/Controller/BaseController.cs
index 244a100..d9d602d 100644
--- a/Base/Controller/BaseController.cs
+++ b/Base/Controller/BaseController.cs
@@ -85,6 +85,10 @@ namespace NP.Base
                         try
                         {
                             var tc = Request.Cookies.Get(suitv);
+                            if (TopMenuNo == 2 && tc == null)
+                            {
+                                tc = filterContext.HttpContext.Request.Cookies[SUIFTCROOM];
+                            }
                             if (tc == null || string.IsNullOrEmpty(tc.Value) || Convert.ToDateTime(DecString(tc.Value)).AddHours(8) < DateTime.Now)
                             {
                                 CookieClear(null, true);
@@ -99,9 +103,19 @@ namespace NP.Base
                             }
                             else
                             {
-                                //tc.Value = EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                                //Response.Cookies.Add(tc);
-                                Response.Cookies[suitv].Value = EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                                tc.Value = EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) + ";SameSite=None";
+                                tc.Secure = true;
+                                tc.HttpOnly = true;
+                                Response.Cookies.Set(tc);
+                                //Response.Cookies[suitv].Value = EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ 
+                                if (TopMenuNo == 2)
+                                {
+                                    var suiftcroom = new System.Web.HttpCookie(SUIFTCROOM, EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
+                                    suiftcroom.HttpOnly = true;
+                                    Response.Cookies.Set(suiftcroom);
+                                }
+
                                 //상시 db접속요청(쪽지수, 알림 수 등) 작업은 여기서 일괄처리해야 성능향상됨
                                 ViewBag.Main3MAlarmCount = ViewBag.MainMemoNotCount = 0;
                                 var data = new List<NP.Model.Data>() { };
diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs
index ea4da47..6448cb6 100644
--- a/Base/Controller/BasePartialController.cs
+++ b/Base/Controller/BasePartialController.cs
@@ -36,11 +36,12 @@ namespace NP.Base
         public const String SUI = "NPTECHSUI";
         public const String SUIT = "NPTECHSUIT";
         public const String SUIF = "NPTECHSUIF";
-        public const String SUIFCROOM = "NPTECHSUIFCROOM";
         public const String SUIFT = "NPTECHSUIFT";
+        public const String SUIFCROOM = "NPTECHSUIFCROOM";
+        public const String SUIFTCROOM = "NPTECHSUIFTCROOM";        
         private const String SUIDATE = "190517";
 
-        public NP.Model.SSUserInfo SUserInfo = new Model.SSUserInfo();
+        public NP.Model.SSUserInfo SUserInfo = new Model.SSUserInfo(); 
         public void SSClear()
         {
             HttpContext.Session.Clear();
@@ -884,9 +885,13 @@ namespace NP.Base
                 SUserInfo.UserInfo + "$" +
                 SUserInfo.LoginKey + "$" +
                 DateTime.Now.ToString("yyMMddHHmmss") + "$" +
-                SUserInfo.LoginIP) + ";SameSite=None; Secure");
+                SUserInfo.LoginIP) + ";SameSite=None");
+            c.Secure = true;
+            c.HttpOnly = true;
             Response.Cookies.Add(c);
-            var c2 = new System.Web.HttpCookie(TopMenuNo == 1 ? SUIT : SUIFT, EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
+            var c2 = new System.Web.HttpCookie(TopMenuNo == 1 ? SUIT : SUIFT, EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) + ";SameSite=None");
+            c2.Secure = true;
+            c2.HttpOnly = true;
             Response.Cookies.Add(c2);
             if (isFront)
             {
@@ -904,8 +909,10 @@ namespace NP.Base
                 SUserInfo.LoginKey + "$" +
                 DateTime.Now.ToString("yyMMddHHmmss") + "$" +
                 SUserInfo.LoginIP));
+            c.HttpOnly = true;
             Response.Cookies.Add(c);
-            var c2 = new System.Web.HttpCookie(SUIFT, EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
+            var c2 = new System.Web.HttpCookie(SUIFTCROOM, EncString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")));
+            c2.HttpOnly = true;
             Response.Cookies.Add(c2);
         }
         protected bool IsEmail(string email)