diff --git a/extra/site-watcher/db/db.factor b/extra/site-watcher/db/db.factor
index fa8a586ae1..0c62c7f791 100644
--- a/extra/site-watcher/db/db.factor
+++ b/extra/site-watcher/db/db.factor
@@ -65,7 +65,7 @@ TUPLE: reporting-site email url up? changed? last-up? error last-error ;
     update-tuple ;
 
 : sites-to-report ( -- seq )
-    "select account.email, site.url, site.up, site.changed, site.last_up, site.error, site.last_error from account, site, watching_site where account.account_id = watching_site.account_id and site.site_id = watching_site.site_id and site.changed = '1'" sql-query 
+    "select account.email, site.url, site.up, site.changed, site.last_up, site.error, site.last_error from account, site, watching_site where account.account_name = watching_site.account_name and site.site_id = watching_site.site_id and site.changed = '1'" sql-query 
     [ [ reporting-site boa ] input<sequence ] map
     "update site set changed = 'f';" sql-command ;
 
@@ -89,4 +89,4 @@ PRIVATE>
 
 : watching-sites ( username -- sites )
     f <watching-site> select-tuples
-    [ site-id>> site new swap >>site-id select-tuple ] map ;
\ No newline at end of file
+    [ site-id>> site new swap >>site-id select-tuple ] map ;
diff --git a/extra/site-watcher/site-watcher-tests.factor b/extra/site-watcher/site-watcher-tests.factor
index 385edf41ad..68a4a440f6 100644
--- a/extra/site-watcher/site-watcher-tests.factor
+++ b/extra/site-watcher/site-watcher-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: db.tuples locals site-watcher site-watcher.db
 site-watcher.private kernel db io.directories io.files.temp
-continuations ;
+continuations db.sqlite site-watcher.db.private ;
 IN: site-watcher.tests
 
 : site-watcher-path ( -- path ) "site-watcher.db" temp-file ; inline