diff --git a/app/class/UserManager.php b/app/class/UserManager.php
index 7ba528d..93687c5 100644
--- a/app/class/UserManager.php
+++ b/app/class/UserManager.php
@@ -26,7 +26,7 @@ class UserManager
 			if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($username))) {
 				if ($user['password'] == UserManager::getHashPassword($password)) {
 					if (isset($rememberMe) && $rememberMe == 'true') {
-						setcookie ("rememberMe", $this->setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), str_replace("login", "", str_replace('https://' . $_SERVER['HTTP_HOST'], "", $_SERVER['REQUEST_URI'])), $_SERVER['HTTP_HOST'], 1);
+						setcookie ("rememberMe", $this->setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), BASEDIR, $_SERVER['HTTP_HOST'], 1);
 					}
 					$_SESSION['user']['id'] = $user['user_id'];
 					$page = "./index.php";
@@ -64,11 +64,12 @@ class UserManager
 	public function logout () {
 		unset($_SESSION['user']);
 		session_destroy();
+
+
+
 		if (isset($_COOKIE['rememberMe'])){
-			//unset($_COOKIE['rememberMe']);
-			setcookie ("rememberMe2", $this->setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), '/vasek/home/', $_SERVER['HTTP_HOST'], 1);
-			setcookie("token", "restt", time() - 36000, "/");
-			die();
+			unset($_COOKIE['rememberMe']);
+			setcookie("rememberMe", 'false', time(), BASEDIR, $_SERVER['HTTP_HOST']);
 		}
 	}