diff --git a/scp/logout.php b/scp/logout.php
index 806e0afb13fdb6df2aeabb7cec2bb083f4c69776..bdc697c78beceb7b4cf3185603f45afbcf8d2838 100644
--- a/scp/logout.php
+++ b/scp/logout.php
@@ -25,8 +25,11 @@ $thisstaff->logOut();
 //Clear any ticket locks the staff has.
 TicketLock::removeStaffLocks($thisstaff->getId());
 
-//Clear upgrader session on logout.
-$_SESSION['ost_upgrader'] = null;
+//Destroy session on logout.
+// TODO: Stop doing this starting with 1.9 - separate session data per
+// app/panel.
+session_unset();
+session_destroy();
 
 @header('Location: login.php');
 require('login.php');