diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index b72215792..88de5b25f 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -28,18 +28,18 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("config.inc");
-require_once("csrf/csrf-magic.php");
 require_once("util.inc");
 
 /* Include authentication routines */
 /* THIS MUST BE ABOVE ALL OTHER CODE */
-if(isset($nocsrf) && !$nocsrf) {
+if(empty($nocsrf)) {
 
 function csrf_startup() {
 		csrf_conf('rewrite-js', '/csrf/csrf-magic.js');
 		$timeout_minutes = isset($config['system']['webgui']['session_timeout']) ?  $config['system']['webgui']['session_timeout'] : 240;
 		csrf_conf('expires', $timeout_minutes * 60);
 	}
+	require_once("csrf/csrf-magic.php");
 }
 
 function set_language($lang)