diff --git a/src/webserver.js b/src/webserver.js
index 2f6fddde44..e9280cdb5d 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -378,10 +378,11 @@ passport.deserializeUser(function(uid, done) {
 					data.joindate = utils.relativeTime(data.joindate);
 					data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();;
 					data.uid = uid;
+					
 					callback({
-						yourid:req.user.uid,
-						theirid:uid,
-						user:data
+						yourid: (req.user)?req.user.uid : 0,
+						theirid: uid,
+						user: data
 					});
 				}
 				else