diff --git a/History.md b/History.md
index 0378f1b54d..a943c3619a 100644
--- a/History.md
+++ b/History.md
@@ -22,7 +22,9 @@
     to restore the old behavior where anyone can write to any collection which
     has not been configured with `allow` or `deny`
 
-  For more information on Meteor Accounts, see http://docs.meteor.com/#accounts
+  For more information on Meteor Accounts, see:
+     http://docs.meteor.com/#dataandsecurity
+     http://docs.meteor.com/#accounts_api
 
 * The new function `Meteor.autorun` allows you run any code in a reactive
   context. See http://docs.meteor.com/#meteor_autorun
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 570f21831c..eab03d13ad 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -12,7 +12,6 @@ when writing those apps.
 {{> reactivity }}
 {{> livehtml }}
 {{> templates }}
-{{> accounts }}
 {{> packages_concept }}
 {{> deploying }}
 </template>
@@ -192,6 +191,16 @@ modify data, those modifications can run locally without waiting for the
 confirmation from the server, while still giving the server final say
 over the requested change.
 
+Meteor provides low-level APIs that allows any login system to take advantage of
+the data and RPC security features, but most developers will want to use [Meteor
+Accounts](#accounts_api), our full-featured authentication system featuring both
+secure login with passwords and integration with external services such as
+Facebook and Twitter. To help you make your app secure as quickly as possible,
+you can even use [Accounts UI](#accountsui), a pre-built user interface which
+lets you add a complete login and signup system to your app with just one line
+of code. It even contains password change, email-based password reset, and
+configuration wizards for the external service providers.
+
 {{#note}}
 The current release of Meteor supports MongoDB, the popular document
 database, and the examples in this section use the
@@ -483,27 +492,6 @@ discussion.
     > Session.set("weather", "cool and dry");
     In DOM:  <div>It'll be cool and dry tonight</div>
 
-{{/better_markdown}}
-</template>
-
-<template name="accounts">
-{{#better_markdown}}
-
-<h2 id="accounts">Accounts</h2>
-
-Meteor has an Accounts system.
-
-- simplest integration
- - add accounts-ui accounts-password
- - and XXX loginButtons}} to app
-
-- which packages
-
-- can build own accounts-ui
-
-- link to api section
-
-
 {{/better_markdown}}
 </template>
 
diff --git a/docs/client/docs.js b/docs/client/docs.js
index eaff8cd064..ff18de102c 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -85,7 +85,6 @@ var toc = [
     "Reactivity",
     "Live HTML",
     "Templates",
-    "Accounts",
     "Smart packages",
     "Deploying"
   ],