diff --git a/include/auth.php b/include/auth.php
index 4c7e85d867..ec02cd85c0 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -28,6 +28,15 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		goaway($a->get_baseurl());
 	}
 
+	if(x($_SESSION['visitor_id']) && (! x($_SESSION['uid']))) {
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+			intval($_SESSION['visitor_id'])
+		);
+		if(count($r)) {
+			$a->contact = $r[0];
+		}
+	}
+
 	if(x($_SESSION,'uid')) {
 
 		// already logged in user returning