diff --git a/collects/help/bug-report.rkt b/collects/help/bug-report.rkt
index 135b4b0e80..68274d3b07 100644
--- a/collects/help/bug-report.rkt
+++ b/collects/help/bug-report.rkt
@@ -201,6 +201,7 @@
     (set! cancel-kill-cust (make-custodian))
     (define response-chan (make-channel))
     (define exn-chan (make-channel))
+    (define starter-query (get-query))
     (define worker-thread
       (parameterize ([current-custodian cancel-kill-cust]
                      [current-alist-separator-mode 'amp])
@@ -222,16 +223,15 @@
                      "Are you human?" ; FIXME: use string-constant
                      captcha-question bug-frame)))
              (define post-data
-               (let* ([q (get-query)]
-                      [q (if captcha-answer
+               (let* ([q (if captcha-answer
                              `([captcha . ,captcha-answer]
                                ;; send back the question too: if things get really
                                ;; bad, then the server can make up random captchas
                                ;; and check the reply against the challenge that
                                ;; was used
                                [captcha-question . ,captcha-question]
-                               ,@q)
-                             q)])
+                               ,@starter-query)
+                             starter-query)])
                  (string->bytes/utf-8 (alist->form-urlencoded q))))
 
              (call/input-url
diff --git a/collects/help/private/bug-report-controls.rkt b/collects/help/private/bug-report-controls.rkt
index b984067540..1641cf8855 100644
--- a/collects/help/private/bug-report-controls.rkt
+++ b/collects/help/private/bug-report-controls.rkt
@@ -322,7 +322,7 @@
                    (format "Human Language: ~a\n" (send human-language get-value))
                    (format "(current-memory-use) ~a\n" (send memory-use get-value))
                    (format "Links: ~a\n" (send links-ctrl get-value))
-                   (format "Planet2 (show):\n~a\n" (send planet2-info get-value))
+                   (format "Planet2 (show):\n~a\n" (send (send planet2-info get-editor) get-text))
                    "\n"
                    "\nCollections:\n"
                    (format "~a" (send (send collections get-editor) get-text))