diff --git a/about.php b/about.php
index 3f7a942..40ca137 100644
--- a/about.php
+++ b/about.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
diff --git a/admin.php b/admin.php
index 61a7b2d..7c2bb59 100644
--- a/admin.php
+++ b/admin.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -13,10 +13,10 @@ $Primary = 0;
 $filterID = -1;
 $Error = "";
 
-if (!isset($_COOKIE[$cookieName]) || !isset($_COOKIE[$cookieTypeName])) {
+if (!isset($_SESSION['key']) || !isset($_SESSION['type'])) {
     header('Location: login.php?redir=admin');
     die();
-} else if ($_COOKIE[$cookieTypeName] != 2) { // not allowed
+} else if ($_SESSION['type'] != 2) { // not allowed
     header('Location: /');
     die();
 }
@@ -49,7 +49,7 @@ $Database = createTables($sqlDB);
 $DatabaseQuery = $Database->query('SELECT * FROM keys');
 
 while ($line = $DatabaseQuery->fetchArray()) {
-    if ($line['key'] == $_COOKIE[$cookieName] && $_COOKIE[$cookieName] != "" && $line['key'] != "" && $line['keytype'] == 2 && ($enableKeys || $enableKeys == "true")) {
+    if ($line['key'] == $_SESSION['key'] && $_SESSION['key'] != "" && $line['key'] != "" && $line['keytype'] == 2 && ($enableKeys || $enableKeys == "true")) {
         $Authorized = 1;
         $Primary = $line['primaryadmin'];
         break;
diff --git a/config.def.ini b/config.def.ini
index 1db7b8a..7d7eeb0 100644
--- a/config.def.ini
+++ b/config.def.ini
@@ -26,7 +26,6 @@ sqldb                     = curload.sql
 enable_keys               = true
 enable_temporary_keys     = true
 enable_admin_keys         = true
-cookie_name               = speedierocks
 
 [logging]
 store_ip                  = true
diff --git a/config.php b/config.php
index cb1a7cc..0f1cf09 100644
--- a/config.php
+++ b/config.php
@@ -24,13 +24,11 @@ $dateFormat             = "Y/m/d";
 $instanceName           = "curload";
 $instanceDescription    = "curload is a simple file uploading site allowing users to upload files by authenticating using a key.";
 $footerText             = "Licensed under the GNU Affero General Public License version 3.0.";
-$cookieName             = "speedierocks";
 $enableKeys             = true;
 $enableAdminKeys        = true;
 $enableTemporaryKeys    = true;
 $enableUploadRemoval    = true;
 $enableKeyUploadRemoval = false;
-$cookieTypeName         = "$cookieName" . "_type";
 
 $configFile = "";
 
@@ -72,7 +70,5 @@ $enableAdminKeys = $configEntries['enable_admin_keys'];
 $enableTemporaryKeys = $configEntries['enable_temporary_keys'];
 $enableUploadRemoval = $configEntries['enable_upload_removal'];
 $enableKeyUploadRemoval = $configEntries['enable_key_upload_removal'];
-$cookieName = $configEntries['cookie_name'];
 $javaScript = $configEntries['javascript'];
-$cookieTypeName = "$cookieName" . "_type";
 ?>
diff --git a/core.php b/core.php
index 2b9160f..80387ef 100644
--- a/core.php
+++ b/core.php
@@ -51,7 +51,7 @@ function printHeader($html) {
     $html .= "\t\t\t<span id='titleSpan' class='title'>\n";
     if (file_exists($Logo)) $html .= "\t\t\t\t<img src=\"$Logo\" id=\"titleLogo\" class=\"title\" width=\"$logoHeaderSize\" height=\"$logoHeaderSize\">\n";
     $html .= "\t\t\t\t<small id='title'><a id='title' href=\"/\">$instanceName</a></small>\n";
-    if (isset($_COOKIE[$cookieName])) $html .= "\t\t\t\t<small id='files'><a id='files' href=\"files.php\">Your files</a></small>\n";
+    if (isset($_SESSION['key'])) $html .= "\t\t\t\t<small id='files'><a id='files' href=\"files.php\">Your files</a></small>\n";
 
     foreach (glob('*.php') as $file) {
         if (!file_exists("$file".".name")) {
@@ -63,13 +63,13 @@ function printHeader($html) {
         $html .= "\t\t\t\t<small id='$name'><a id='$name' href=\"$file\">$name</a></small>\n";
     }
 
-    if (!isset($_COOKIE[$cookieName])) {
+    if (!isset($_SESSION['key'])) {
         $html .= "\t\t\t\t<small id='login'><a id='login' href=\"login.php\">Log in</a></small>\n";
     } else {
         $html .= "\t\t\t\t<small id='logout'><a id='logout' href=\"login.php?logout=true\">Log out</a></small>\n";
     }
 
-    if (isset($_COOKIE[$cookieTypeName]) && $_COOKIE[$cookieTypeName] == 2) {
+    if (isset($_SESSION['type']) && $_SESSION['type'] == 2) {
         $html .= "\t\t\t\t<small id='administration'><a id='administration' href=\"admin.php\">Administration</a></small>\n";
     }
 
@@ -101,7 +101,7 @@ function printFileUploadForm($html, $Error) {
     include "config.php";
 
     // print the form
-    if (isset($_COOKIE[$cookieTypeName]) || ($publicUploading || $publicUploading == "true")) {
+    if (isset($_SESSION['type']) || ($publicUploading || $publicUploading == "true")) {
         $html .= "\t\t\t<form action=\"upload.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
         $html .= "\t\t\t\t<input type=\"file\" name=\"file\" id=\"file\">\n";
         $html .= "\t\t\t\t<input type=\"submit\" value=\"Upload selected file\" name=\"web\">\n";
diff --git a/create.php b/create.php
index b34f87e..89654d3 100644
--- a/create.php
+++ b/create.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -29,10 +29,10 @@ $DatabaseQuery = $Database->query('SELECT * FROM keys');
 if (!checkIfAdminExists()) {
     $firstKey = 1;
 } else {
-    if (!isset($_COOKIE[$cookieName]) || !isset($_COOKIE[$cookieTypeName])) {
+    if (!isset($_SESSION['key']) || !isset($_SESSION['type'])) {
         header('Location: login.php?redir=admin');
         die();
-    } else if ($_COOKIE[$cookieTypeName] != 2) { // not allowed
+    } else if ($_SESSION['type'] != 2) { // not allowed
         header('Location: /');
         die();
     }
@@ -42,7 +42,7 @@ if (!checkIfAdminExists()) {
 
 $DatabaseQuery = $Database->query('SELECT * FROM keys');
 while ($line = $DatabaseQuery->fetchArray()) {
-    if ($line['key'] == $_COOKIE[$cookieName] && $_COOKIE[$cookieName] != "" && $line['key'] != "" && ($enableKeys || $enableKeys == "true")) {
+    if ($line['key'] == $_SESSION['key'] && $_SESSION['key'] != "" && $line['key'] != "" && ($enableKeys || $enableKeys == "true")) {
         $AuthorizedCreation = 1;
         $AdminIsPrimary = $line['primaryadmin'];
         break;
diff --git a/files.php b/files.php
index 6f550e4..2bdbf50 100644
--- a/files.php
+++ b/files.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -17,7 +17,7 @@ $html .= "\t\t\t<h1>Your files</h1>\n";
 $html .= "\t\t\t\t<p>These are the files you have uploaded using this key.</p>\n";
 
 // If logged in ...
-if (isset($_COOKIE[$cookieTypeName]) && (!$publicUploading || $publicUploading == "false")) {
+if (isset($_SESSION['type']) && (!$publicUploading || $publicUploading == "false")) {
     $Database = createTables($sqlDB);
     $DatabaseQuery = $Database->query('SELECT * FROM uploads');
 
@@ -46,7 +46,7 @@ if (isset($_COOKIE[$cookieTypeName]) && (!$publicUploading || $publicUploading =
 
         $UserDatabaseQuery = $Database->query('SELECT * FROM keys');
         while ($uline = $UserDatabaseQuery->fetchArray()) {
-            if ($uline['id'] == $keyID && $_COOKIE[$cookieName] == $uline['key']) {
+            if ($uline['id'] == $keyID && $_SESSION['key'] == $uline['key']) {
                 $CorrectFile = 1;
                 break;
             }
diff --git a/index.php b/index.php
index 2098549..7a68f34 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -29,7 +29,7 @@ $html .= "\t\t\t<h1>$instanceName</h1>\n";
 $html .= "\t\t\t\t<p>$instanceDescription</p>\n";
 
 // If logged in ...
-if (isset($_COOKIE[$cookieTypeName]) || ($publicUploading || $publicUploading == "true")) {
+if (isset($_SESSION['type']) || ($publicUploading || $publicUploading == "true")) {
     $html = printFileUploadForm($html, $Error);
 } else {
     $html .= "\t\t\t\t<p>To upload a file, <a href=\"login.php\">log in using your key</a> and select a file to upload. After uploading, you will receive a link to the file stored on the servers.</p>\n";
diff --git a/login.php b/login.php
index 68c3752..97663f1 100644
--- a/login.php
+++ b/login.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -15,16 +15,17 @@ if (isset($_REQUEST['redir'])) {
     $Redirect = $_REQUEST['redir'];
 }
 
-// if a cookie exists, redirect the user there instead
-if (isset($_COOKIE[$cookieName])) {
+// if a session exists, redirect the user there instead
+if (isset($_SESSION['key'])) {
     if (isset($_REQUEST['logout']) && $_REQUEST['logout'] == "true") {
-        setcookie($cookieName, "", 0);
-        setcookie($cookieTypeName, "", 0);
+        session_unset();
+        session_destroy();
+
         header('Location: login.php');
         die();
     }
 
-    if ($Redirect == "index" || ($Redirect == "admin" && $_COOKIE[$cookieTypeName] != 2) || $Redirect == "") {
+    if ($Redirect == "index" || ($Redirect == "admin" && $_SESSION['type'] != 2) || $Redirect == "") {
         header('Location: /');
         die();
     } else if ($Redirect == "admin") {
@@ -78,8 +79,8 @@ if (isset($_REQUEST['key'])) {
         die();
     }
 
-    setcookie($cookieName, $Key);
-    setcookie($cookieTypeName, $KeyType);
+    $_SESSION['key'] = $Key;
+    $_SESSION['type'] = $KeyType;
 
     if ($Redirect != "") { // just so we can try again and still be redirected to the right place
         header("Location: login.php?e=true&redir=$Redirect");
diff --git a/remove-key.php b/remove-key.php
index b7b7503..7a06172 100644
--- a/remove-key.php
+++ b/remove-key.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -7,10 +7,10 @@
 include "config.php";
 include "core.php";
 
-if (!isset($_COOKIE[$cookieName]) || !isset($_COOKIE[$cookieTypeName])) {
+if (!isset($_SESSION['key']) || !isset($_SESSION['type'])) {
     header('Location: login.php?redir=admin');
     die();
-} else if ($_COOKIE[$cookieTypeName] != 2) { // not allowed
+} else if ($_SESSION['type'] != 2) { // not allowed
     header('Location: /');
     die();
 }
@@ -45,7 +45,7 @@ $Database = createTables($sqlDB);
 $DatabaseQuery = $Database->query('SELECT * FROM keys');
 
 while ($line = $DatabaseQuery->fetchArray()) {
-    if ($line['keytype'] == 2 && $line['key'] == $_COOKIE[$cookieName] && $_COOKIE[$cookieName] != "" && $line['key'] != "" && ($enableKeys || $enableKeys == "true")) {
+    if ($line['keytype'] == 2 && $line['key'] == $_SESSION['key'] && $_SESSION['key'] != "" && $line['key'] != "" && ($enableKeys || $enableKeys == "true")) {
         $AuthorizedRemoval = 1;
         $AdminIsPrimary = $line['primaryadmin'];
         break;
diff --git a/remove.php b/remove.php
index 863a353..6331d68 100644
--- a/remove.php
+++ b/remove.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -7,10 +7,10 @@
 include "config.php";
 include "core.php";
 
-if (!isset($_COOKIE[$cookieName]) || !isset($_COOKIE[$cookieTypeName])) {
+if (!isset($_SESSION['key']) || !isset($_SESSION['type'])) {
     header('Location: login.php');
     die();
-} else if ($_COOKIE[$cookieTypeName] != 2 && (!$enableKeyUploadRemoval || $enableKeyUploadRemoval == "false")) { // not allowed
+} else if ($_SESSION['type'] != 2 && (!$enableKeyUploadRemoval || $enableKeyUploadRemoval == "false")) { // not allowed
     header('Location: /');
     die();
 }
@@ -66,7 +66,7 @@ while ($line = $DatabaseQuery->fetchArray()) {
             }
 
             while ($kline = $keyDatabaseQuery->fetchArray()) {
-                if ($kline['key'] == $_COOKIE[$cookieName] && $_COOKIE[$cookieName] != "" && $kline['key'] != "" && $kline['keytype'] == 2) { // key = passed key
+                if ($kline['key'] == $_SESSION['key'] && $_SESSION['key'] != "" && $kline['key'] != "" && $kline['keytype'] == 2) { // key = passed key
                     if (($fileUploadedByPrimary == 1 && $kline['primaryadmin'] == 1) || ($fileUploadedByPrimary == 0)) { // primary key passed and primary file OR non primary file
                         $AuthorizedRemoval = 1;
                         break;
diff --git a/setup.php b/setup.php
index 274b9b5..923918c 100644
--- a/setup.php
+++ b/setup.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
diff --git a/upload.php b/upload.php
index 23c98e0..2db8217 100644
--- a/upload.php
+++ b/upload.php
@@ -1,4 +1,4 @@
-<?php
+<?php session_start();
 /* curload
  * Simple file uploading using POST requests and temporary keys
  * Licensed under the GNU Affero General Public License version 3.0
@@ -12,8 +12,8 @@ $WebInterface = 1;
 if (isset($_REQUEST['key'])) {
     $Key = $_REQUEST['key'];
     $WebInterface = 0;
-} else if (isset($_COOKIE[$cookieName])) {
-    $Key = $_COOKIE[$cookieName];
+} else if (isset($_SESSION['key'])) {
+    $Key = $_SESSION['key'];
     $WebInterface = 1;
 } else if (!$publicUploading || $publicUploading == "false") {
     print "No key specified.";