diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 7510995a7..f048b4d53 100755
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -87,12 +87,12 @@ ThreadWatcher =
       [boardID, threadID] = @parentNode.dataset.fullID.split '.'
       ThreadWatcher.rm boardID, +threadID
     post: (e) ->
-      {board, postID, threadID} = e.detail
+      {boardID, threadID, postID} = e.detail
       if postID is threadID
         if Conf['Auto Watch']
           $.set 'AutoWatch', threadID
       else if Conf['Auto Watch Reply']
-        ThreadWatcher.add g.boards[board.ID].threads[threadID]
+        ThreadWatcher.add g.threads[boardID + '.' + threadID]
     onIndexRefresh: ->
       {db}    = ThreadWatcher
       boardID = g.BOARD.ID
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index c81f27b17..c9d1dd925 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -782,11 +782,11 @@ QR =
 
     # Post/upload confirmed as successful.
     $.event 'QRPostSuccessful', {
-      board: {ID: g.BOARD.ID}
+      boardID: g.BOARD.ID
       threadID
       postID
     }
-    $.event 'QRPostSuccessful_', {threadID, postID}
+    $.event 'QRPostSuccessful_', {boardID: g.BOARD.ID, threadID, postID}
 
     # Enable auto-posting if we have stuff left to post, disable it otherwise.
     postsCount = QR.posts.length - 1