diff --git a/Source/src/app.php b/Source/src/app.php
index 2fceece..d3ae070 100644
--- a/Source/src/app.php
+++ b/Source/src/app.php
@@ -1,4 +1,5 @@
 <?php
+session_start(); //Start session in app, before loading vars ($_SESSION)
 
 require_once __DIR__ . '/../vendor/autoload.php';
 //require_once __DIR__ . '/dbwrapper.php';
@@ -8,6 +9,7 @@ require 'DB.php';
 require 'dbToTable.php';
 require 'users.php';
 
+
 $path = array(
     "html"  =>  "assets/html/",
     "css"   =>  "assets/css/",
@@ -21,10 +23,10 @@ $user = array();
 
 function run(){
     global $user;
-    if(isset($_COOKIE['sessionID'])){
+    if(isset($_SESSION['sessionID'])){
         $db = new DB();
-        if($db->checkCookie($_COOKIE['sessionID'],$_COOKIE['token'])){
-            $user = $db->loadProfile($_COOKIE['sessionID']);
+        if($db->checkCookie($_SESSION['sessionID'],$_SESSION['token'])){
+            $user = $db->loadProfile($_SESSION['sessionID']);
         }
     }
     if (isset($_POST["search"])){
diff --git a/Source/src/users.php b/Source/src/users.php
index 8a0a4ca..1768992 100644
--- a/Source/src/users.php
+++ b/Source/src/users.php
@@ -20,8 +20,8 @@ function checklogin($email,$pass){
         $idu = $db->loadIDU($email);
         $token = RandomString(50);
         $db->setToken($idu,$token);
-        setcookie("token",$token);
-        setcookie("sessionID",$idu);
+        $_SESSION['token'] = $token;
+        $_SESSION['sessionID'] =$idu;
         $db->close();
         return true;
     }
@@ -54,6 +54,5 @@ function register($email,$pass,$nick){
  * Logout user
  */
 function logout(){
-    setcookie("token","",time()-3600);
-    setcookie("sessionID",0,time()-3600);
+    session_destroy(); //Logout
 }
\ No newline at end of file