diff --git a/boot.php b/boot.php
index 8452108ff1..60cdd326a4 100644
--- a/boot.php
+++ b/boot.php
@@ -422,6 +422,10 @@ class App {
 	} 
 
 	function init_pagehead() {
+		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 30000);
+		if($interval < 10000)
+			$interval = 30000;
+
 		$this->page['title'] = $this->config['sitename'];
 		$tpl = file_get_contents('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
@@ -430,7 +434,8 @@ class App {
 			'$delitem' => t('Delete this item?'),
 			'$comment' => t('Comment'),
 			'$showmore' => t('show more'),
-			'$showfewer' => t('show fewer')
+			'$showfewer' => t('show fewer'),
+			'$update_interval' => $interval
 		));
 	}
 
diff --git a/index.php b/index.php
index e43d7332de..5f6d74adb9 100644
--- a/index.php
+++ b/index.php
@@ -93,12 +93,6 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
-/*
- * Create the page head after setting the language
- *
- */
-
-$a->init_pagehead();
 
 /**
  *
@@ -119,6 +113,16 @@ if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module ==
 if(! x($_SESSION,'authenticated'))
 	header('X-Account-Management-Status: none');
 
+
+/*
+ * Create the page head after setting the language
+ * and getting any auth credentials
+ */
+
+$a->init_pagehead();
+
+
+
 if(! x($_SESSION,'sysmsg'))
 	$_SESSION['sysmsg'] = array();
 
diff --git a/js/main.js b/js/main.js
index 829af2258f..3428886e70 100644
--- a/js/main.js
+++ b/js/main.js
@@ -204,7 +204,7 @@
 				});
 			}) ;
 		}
-		timer = setTimeout(NavUpdate,30000);
+		timer = setTimeout(NavUpdate,updateInterval);
 	}
 
 	function liveUpdate() {
diff --git a/view/head.tpl b/view/head.tpl
index 055c3cef58..9fe5a63b3b 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -28,6 +28,8 @@
 <script type="text/javascript" src="$baseurl/js/main.js" ></script>
 <script>
 
+	var updateInterval = $update_interval;
+
 	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
 		if(obj.value == '$comment') {