diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 29ec892d32e..41a1159e17d 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9075
\ No newline at end of file
+9076
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 6a1d5292083..08c38dd678d 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-70b1cb4b8ff30538b3f952a5418ff5b12dc38662
\ No newline at end of file
+2f10cf7b02a921d4e85bd3514035bccef06f3fc7
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/contrib/merge-users.pl b/mozilla/webtools/bugzilla/contrib/merge-users.pl
index 272f5586af1..62b08792132 100755
--- a/mozilla/webtools/bugzilla/contrib/merge-users.pl
+++ b/mozilla/webtools/bugzilla/contrib/merge-users.pl
@@ -154,8 +154,9 @@ my $dupe_ids = $dbh->selectcol_arrayref("
            INNER JOIN bug_user_last_visit as later
            ON (earlier.user_id != later.user_id AND earlier.last_visit_ts < later.last_visit_ts
                AND earlier.bug_id = later.bug_id)
-     WHERE (earlier.user_id = ? OR earlier.user_id = ?)",
-    undef, $old_id, $new_id);
+     WHERE (earlier.user_id = ? OR earlier.user_id = ?)
+           AND (later.user_id = ? OR later.user_id = ?)",
+    undef, $old_id, $new_id, $old_id, $new_id);
 $dbh->do("DELETE FROM bug_user_last_visit WHERE " . $dbh->sql_in('id', $dupe_ids));
 
 # Migrate records from old user to new user.