diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 478fecb97..021f6f69d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -334,7 +334,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "    </li>\n";
 			echo "   </ul>\n";
 
-			if($this->params['enablemenutasks']) {
+			if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) {
 				echo "   <div id=\"menu-tasks\">";
 				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
 //				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 8e49920b6..381a904f7 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -224,6 +224,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript');
 ?>
@@ -232,6 +234,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 		$('#calendar').fullCalendar({
 			height: $(window).height()-210,
 			locale: '<?php echo substr($this->params['session']->getLanguage(), 0, 2); ?>',
+<?php if(!$user->isGuest()) { ?>
 			customButtons: {
 				addEventButton: {
 					text: '<?php printMLText('add_event'); ?>',
@@ -241,6 +244,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			},
+<?php } ?>
 			header: {
 				left: 'prev,next today addEventButton',
 				center: 'title',