diff --git a/boot.php b/boot.php
index 0ae0901d22..dfe0725783 100644
--- a/boot.php
+++ b/boot.php
@@ -4,6 +4,7 @@ require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
+require_once('include/datetime.php');
 require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
@@ -333,6 +334,12 @@ if(! class_exists('App')) {
 
 		function __construct() {
 
+			global $default_timezone;
+
+			$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
+
+			date_default_timezone_set($this->timezone);
+
 			$this->config = array();
 			$this->page = array();
 			$this->pager= array();
diff --git a/index.php b/index.php
index 94329eedc8..6967d0f315 100644
--- a/index.php
+++ b/index.php
@@ -59,8 +59,7 @@ if(! $install) {
 /**
  *
  * Important stuff we always need to do.
- * Initialise authentication and  date and time. 
- * Create the HTML head for the page, even if we may not use it (xml, etc.)
+ *
  * The order of these may be important so use caution if you think they're all
  * intertwingled with no logical order and decide to sort it out. Some of the
  * dependencies have changed, but at least at one time in the recent past - the 
@@ -68,12 +67,6 @@ if(! $install) {
  *
  */
 
-require_once("datetime.php");
-
-$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
-
-date_default_timezone_set($a->timezone);
-
 session_start();
 
 /**
diff --git a/mod/profile.php b/mod/profile.php
index 3a77faf19a..2ac8fe586d 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -67,7 +67,7 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-	$category = datequery = $datequery2 = '';
+	$category = $datequery = $datequery2 = '';
 
 	if($a->argc > 2) {
 		for($x = 2; $x < $a->argc; $x ++) {