diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 3cd99b4f6..2d3bbdbf2 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -182,13 +182,13 @@ class user_shortcodes extends e_shortcode
 	
 	function sc_user_lastvisit($parm='')
 	{
-		return $this->var['user_currentvisit'] ? e107::getDate()->convert_date($this->var['user_currentvisit'], "long") : "<i>".LAN_USER_33."</i>";
+		return $this->var['user_currentvisit'] ? e107::getDate()->convert_date($this->var['user_currentvisit'], "long") : e107::getDate()->convert_date($this->var['user_lastvisit'], "long");
 	}
 	
 	
 	function sc_user_lastvisit_lapse($parm='')
 	{	
-		return $this->var['user_currentvisit'] ? e107::getDate()->computeLapse($this->var['user_currentvisit']) : '';
+		return $this->var['user_currentvisit'] ? e107::getDate()->computeLapse($this->var['user_currentvisit']) : e107::getDate()->computeLapse($this->var['user_lastvisit']);
 	}
 
 	
diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php
index 6db0976b1..3a52a244f 100644
--- a/e107_handlers/date_handler.php
+++ b/e107_handlers/date_handler.php
@@ -141,6 +141,7 @@ class e_date
 	function convert_date($datestamp, $mask = '')
 	{
 		$datestamp = (int) $datestamp;
+		if($datestamp == 0) return "";
 
 		if(empty($mask))
 		{
@@ -596,6 +597,7 @@ class e_date
 	function computeLapse($older_date, $newer_date = FALSE, $mode = FALSE, $show_secs = TRUE, $format = 'long') 
 	{
 		$older_date = (int) $older_date;
+		if($older_date == 0) return "";
 
 		if(empty($newer_date))
 		{