diff --git a/application/modules/default/views/scripts/login/set.phtml b/application/modules/default/views/scripts/login/set.phtml
index e33d1189e..cc8a6aff3 100644
--- a/application/modules/default/views/scripts/login/set.phtml
+++ b/application/modules/default/views/scripts/login/set.phtml
@@ -1,26 +1,27 @@
 <?php
 header('content-type: image/png');
 require APPLICATION_LIB . "/Local/LoginCookie.php";
 
 if (isset($_GET['k'])) {
     $key = $_GET['k'];
     $id = Local_LoginCookie::readJwt($key);
     if ($id) {
         $cookie_lifetime = (int)Zend_Registry::get('config')->resources->session->remember_me_seconds;
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         if ($data = $cache->load($id)) {
+            $cookie_domain = Local_Tools_ParseDomain::get_domain($_SERVER['HTTP_HOST']);
             $cookie_params = session_get_cookie_params();
-            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], '', $cookie_params['secure'], true);
+            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], $cookie_domain, $cookie_params['secure'], true);
             if (false == empty($data['remember_me'])) {
                 $cookie_name = Zend_Registry::get('config')->settings->session->remember_me->name;
-                setcookie($cookie_name, serialize($data['remember_me']), time() + $cookie_lifetime, $cookie_params['path'], '', $cookie_params['secure'], true);
+                setcookie($cookie_name, serialize($data['remember_me']), time() + $cookie_lifetime, $cookie_params['path'], $cookie_domain, $cookie_params['secure'], true);
             }
             $cache->remove($id);
         }
     }
 }
 
 $imagePath = APPLICATION_PATH . "/../httpdocs/img/default.png";
 $image = file_get_contents($imagePath);
 echo $image;
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/login/settheme.phtml b/application/modules/default/views/scripts/login/settheme.phtml
index 5ce234a94..9a27cc282 100644
--- a/application/modules/default/views/scripts/login/settheme.phtml
+++ b/application/modules/default/views/scripts/login/settheme.phtml
@@ -1,23 +1,24 @@
 <?php
 require APPLICATION_LIB . "/Local/LoginCookie.php";
 
 header("Content-type: text/css");
 if (isset($_GET['k'])) {
     $key = $_GET['k'];
     $id = Local_LoginCookie::readJwt($key);
     if ($id) {
         $cookie_lifetime = (int)Zend_Registry::get('config')->resources->session->remember_me_seconds;
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         if ($data = $cache->load($id)) {
+            $cookie_domain = Local_Tools_ParseDomain::get_domain($_SERVER['HTTP_HOST']);
             $cookie_params = session_get_cookie_params();
-            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], $_SERVER['HTTP_HOST'], $cookie_params['secure'], true);
+            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], $cookie_domain, $cookie_params['secure'], true);
             if (false == empty($data['remember_me'])) {
                 $cookie_name = Zend_Registry::get('config')->settings->session->remember_me->name;
-                setcookie($cookie_name, serialize($data['remember_me']), time() + $cookie_lifetime, $cookie_params['path'], $_SERVER['HTTP_HOST'], $cookie_params['secure'], true);
+                setcookie($cookie_name, serialize($data['remember_me']), time() + $cookie_lifetime, $cookie_params['path'], $cookie_domain, $cookie_params['secure'], true);
             }
             $cache->remove($id);
         }
     }
 }
 include APPLICATION_PATH . "/../httpdocs/theme/flatui/css/empty.css";
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/logout/set.phtml b/application/modules/default/views/scripts/logout/set.phtml
index e55742aa7..b1ae589a6 100644
--- a/application/modules/default/views/scripts/logout/set.phtml
+++ b/application/modules/default/views/scripts/logout/set.phtml
@@ -1,33 +1,34 @@
 <?php
 header('content-type: image/png');
 
 if (isset($_SERVER['HTTP_COOKIE'])) {
     $cookies = explode(';', $_SERVER['HTTP_COOKIE']);
     $cookie_params = session_get_cookie_params();
     foreach($cookies as $cookie) {
         $parts = explode('=', $cookie);
         $name = trim($parts[0]);
-        setcookie($name, false, time()-1000, $cookie_params['path'], $_SERVER['HTTP_HOST'], $cookie_params['secure'], true);
+        setcookie($name, false, time()-1000, $cookie_params['path'], $cookie_params['domain'], $cookie_params['secure'], $cookie_params['httponly']);
     }
 }
 
 require APPLICATION_LIB . "/Local/LoginCookie.php";
 
 if (isset($_GET['k'])) {
     $key = $_GET['k'];
     $id = Local_LoginCookie::readJwt($key);
     if ($id) {
         $cookie_lifetime = (int)Zend_Registry::get('config')->resources->session->cookie_lifetime;
         /** @var Zend_Cache_Core $cache */
         $cache = Zend_Registry::get('cache');
         if ($data = $cache->load($id)) {
+            $cookie_domain = Local_Tools_ParseDomain::get_domain($_SERVER['HTTP_HOST']);
             $cookie_params = session_get_cookie_params();
-            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], $_SERVER['HTTP_HOST'], $cookie_params['secure'], true);
+            setcookie($data['domain'], $data['id'], time() + $cookie_lifetime, $cookie_params['path'], $cookie_domain, $cookie_params['secure'], $cookie_params['httponly']);
             $cache->remove($id);
         }
     }
 }
 
 $imagePath = APPLICATION_PATH . "/../httpdocs/img/default.png";
 $image = file_get_contents($imagePath);
 echo $image;