diff --git a/modules/base/templates/report_visitor.tpl b/modules/base/templates/report_visitor.tpl
index 988518d0f..d24248da6 100644
--- a/modules/base/templates/report_visitor.tpl
+++ b/modules/base/templates/report_visitor.tpl
@@ -1,6 +1,6 @@
 <div>
 	<div style="display: table-cell; vertical-align: middle">
-		<span><img class="owa_avatar" style="vertical-align:middle;" src="<?php echo $this->getAvatarImage( $this->out($this->get('visitor_avatar_id') ) );?>" /></span>
+		<span><img class="owa_avatar" style="vertical-align:middle;" src="<?php $this->out( $this->getAvatarImage( $this->get('visitor_avatar_id') ) );?>" /></span>
 		<span class="inline_h2"><?php $this->out( $visitor_label );?></span>
 	</div>
 	<BR>
diff --git a/owa_template.php b/owa_template.php
index fcc3daf6a..a529f59f9 100755
--- a/owa_template.php
+++ b/owa_template.php
@@ -901,7 +901,7 @@ function formatNumber($num, $decimal_places) {
 	
 	function getAvatarImage($email) {
 		
-		if (false != $email) {
+		if (false != $email && $email !== '(not set)') {
 			$url = sprintf("https://www.gravatar.com/avatar/%s?s=30", md5($email));
 		} else {
 			$url = $this->makeImageLink('base/i/default_user_50x50.png');