diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php
index 19d5973a..8b2d901c 100644
--- a/ncp-web/activate/index.php
+++ b/ncp-web/activate/index.php
@@ -1,3 +1,4 @@
+<?php session_start(); ?>
 <!DOCTYPE html>
 <html class="ng-csp" data-placeholder-focus="false" lang="en">
 <head>
@@ -11,7 +12,6 @@
   <meta http-equiv="pragma" content="no-cache">
   <link rel="icon" type="image/png" href="img/favicon.png"/>
   <link rel="stylesheet" href="CSS.css">
-<?php session_start(); ?>
 </head>
 <body id="body-login">
   <noscript>
diff --git a/ncp-web/index.php b/ncp-web/index.php
index 50926480..c823f5a9 100644
--- a/ncp-web/index.php
+++ b/ncp-web/index.php
@@ -1,11 +1,23 @@
-<!--
+<?php
+/*
  NextCloudPi Web Panel frontend
 
  Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  GPL licensed (see end of file) * Use at your own risk!
 
  More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
--->
+
+**/
+
+// redirect to activation first time
+ob_start();
+exec("a2query -s ncp-activation", $output, $ret);
+if ($ret == 0) {
+  header("Location: activate");
+  exit();
+}
+
+?>
 
 <!DOCTYPE html>
 <html class="ng-csp" data-placeholder-focus="false" lang="en">
@@ -16,14 +28,7 @@
     <meta name="referrer" content="never">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
     <meta name="mobile-web-app-capable" content="yes">
-  <?php
-
-    // redirect to activation first time
-    exec("a2query -s ncp-activation", $output, $ret);
-    if ($ret == 0) {
-      header("Location: activate");
-      exit();
-    }
+<?php
     ini_set('session.cookie_httponly', 1);
     if (isset($_SERVER['HTTPS']))
       ini_set('session.cookie_secure', 1);
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
index 33245018..60f22e65 100644
--- a/ncp-web/ncp-launcher.php
+++ b/ncp-web/ncp-launcher.php
@@ -10,6 +10,7 @@
 
 include ('csrf.php');
 
+ob_start();
 session_start();
 $cfg_dir = '/usr/local/etc/ncp-config.d/';
 $l10nDir = "l10n";
diff --git a/ncp-web/ncp-output.php b/ncp-web/ncp-output.php
index 704b0a58..9820179e 100644
--- a/ncp-web/ncp-output.php
+++ b/ncp-web/ncp-output.php
@@ -8,6 +8,7 @@
 // More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 ///
 
+ob_start();
 header('Content-Type: text/event-stream; charset=utf-8');
 header('Cache-Control: no-cache'); // recommended to prevent caching of event data.
 
