diff --git a/src/metabase/api/setup.clj b/src/metabase/api/setup.clj
index 74c0dcb16d5b03d9ecb6486793cb29e2f20128d6..1ae08d5e1bb17212159a70dfeb13ee1ff4e80b42 100644
--- a/src/metabase/api/setup.clj
+++ b/src/metabase/api/setup.clj
@@ -92,7 +92,7 @@
 ;;; Admin Checklist
 
 (defn- admin-checklist-values []
-  (let [has-dbs?           (db/exists? Database)
+  (let [has-dbs?           (db/exists? Database, :is_sample false)
         has-dashboards?    (db/exists? 'Dashboard)
         has-pulses?        (db/exists? 'Pulse)
         has-labels?        (db/exists? 'Label)
@@ -124,7 +124,7 @@
       :group       "Get connected"
       :description "Share answers and data with the rest of your team."
       :link        "/admin/people/"
-      :completed   (>= num-users 1)
+      :completed   (> num-users 1)
       :triggered   (or has-dashboards?
                        has-pulses?
                        (>= num-cards 5))}