2 files changed, 3 insertions, 8 deletions
diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
index 146a7ea4c6..55fea6b517 100644
--- a/plugins/CoreHome/Columns/UserId.php
+++ b/plugins/CoreHome/Columns/UserId.php
@@ -48,12 +48,7 @@ class UserId extends VisitDimension
      */
     public function onExistingVisit(Request $request, Visitor $visitor, $action)
     {
-        $forcedUserId = $request->getForcedUserId();
-        if ($forcedUserId) {
-            return $forcedUserId;
-        }
-
-        return false;
+        return $request->getForcedUserId();
     }
 
 }
 \ No newline at end of file
diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php
index 688d1c8bb6..35b64b3d30 100644
--- a/plugins/CoreHome/Visitor.php
+++ b/plugins/CoreHome/Visitor.php
@@ -102,10 +102,10 @@ class Visitor
     function getUserId()
     {
         if (isset($this->details['user_id'])
-            && !is_null($this->details['user_id'])) {
+            && strlen($this->details['user_id']) > 0) {
             return $this->details['user_id'];
         }
-        return false;
+        return null;
     }
 
 }
 \ No newline at end of file