diff --git a/login/logout.php b/login/logout.php
index 27a868be1ee..09e9fddb2e6 100644
--- a/login/logout.php
+++ b/login/logout.php
@@ -3,14 +3,15 @@
 
     require_once("../config.php");
 
-    if (ini_get_bool("register_globals")) {
-        // This method is to try to avoid silly warnings from PHP 4.3.0
-        session_unregister("SESSION");
+    if (ini_get_bool("register_globals") and check_php_version("4.3.0")) {
+        // This method is just to try to avoid silly warnings from PHP 4.3.0
         session_unregister("USER");
-    } else {
-        unset($_SESSION['USER']);
-        unset($_SESSION['SESSION']);
+        session_unregister("SESSION");
     }
+
+    unset($_SESSION['USER']);
+    unset($_SESSION['SESSION']);
+
     redirect($CFG->wwwroot);
 
 ?>