diff --git a/README.md b/README.md
index ced29904d..336e7ae89 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ async def on_message(message):
         await asyncio.sleep(5)
         await client.send_message(message.channel, 'Done sleeping')
 
-client.run('email', 'password')
+client.run('token')
 ```
 
 Note that in Python 3.4 you use `@asyncio.coroutine` instead of `async def` and `yield from` instead of `await`.
diff --git a/discord/client.py b/discord/client.py
index 7f8d23f8b..4e6b2c336 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -505,7 +505,7 @@ class Client:
 
         .. code-block:: python
 
-            await client.login('email', 'password')
+            await client.login('token')
 
             # or
 
diff --git a/docs/migrating.rst b/docs/migrating.rst
index df0526c2c..7ad9e6a15 100644
--- a/docs/migrating.rst
+++ b/docs/migrating.rst
@@ -292,14 +292,14 @@ Basically, before:
 
 .. code-block:: python
 
-    client.login('email', 'password')
+    client.login('token')
     client.run()
 
 After:
 
 .. code-block:: python
 
-    client.run('email', 'password')
+    client.run('token')
 
 .. warning::
 
@@ -321,7 +321,7 @@ event loop then doing so is quite straightforward:
 
     @asyncio.coroutine
     def main_task():
-        yield from client.login('email', 'password')
+        yield from client.login('token')
         yield from client.connect()
 
     loop = asyncio.get_event_loop()
diff --git a/examples/background_task.py b/examples/background_task.py
index d08415e39..38dbf482a 100644
--- a/examples/background_task.py
+++ b/examples/background_task.py
@@ -23,7 +23,7 @@ loop = asyncio.get_event_loop()
 
 try:
     loop.create_task(my_background_task())
-    loop.run_until_complete(client.login('email', 'password'))
+    loop.run_until_complete(client.login('token'))
     loop.run_until_complete(client.connect())
 except Exception:
     loop.run_until_complete(client.close())
diff --git a/examples/basic_bot.py b/examples/basic_bot.py
index 81ce0ab43..7d1c83c85 100644
--- a/examples/basic_bot.py
+++ b/examples/basic_bot.py
@@ -62,4 +62,4 @@ async def _bot():
     """Is the bot cool?"""
     await bot.say('Yes, the bot is cool.')
 
-bot.run('email', 'password')
+bot.run('token')
diff --git a/examples/deleted.py b/examples/deleted.py
index a6490fa04..bfbd54efc 100644
--- a/examples/deleted.py
+++ b/examples/deleted.py
@@ -19,4 +19,4 @@ async def on_message_delete(message):
     fmt = '{0.author.name} has deleted the message:\n{0.content}'
     await client.send_message(message.channel, fmt.format(message))
 
-client.run('email', 'password')
+client.run('token')
diff --git a/examples/edits.py b/examples/edits.py
index a10393a09..deac246f0 100644
--- a/examples/edits.py
+++ b/examples/edits.py
@@ -21,4 +21,4 @@ async def on_message_edit(before, after):
     fmt = '**{0.author}** edited their message:\n{1.content}'
     await client.send_message(after.channel, fmt.format(after, before))
 
-client.run('email', 'password')
+client.run('token')
diff --git a/examples/guessing_game.py b/examples/guessing_game.py
index 491f84bb1..ce3f92ad8 100644
--- a/examples/guessing_game.py
+++ b/examples/guessing_game.py
@@ -34,4 +34,4 @@ async def on_ready():
     print(client.user.id)
     print('------')
 
-client.run('email', 'password')
+client.run('token')
diff --git a/examples/new_member.py b/examples/new_member.py
index 69c13341c..f8631bf1c 100644
--- a/examples/new_member.py
+++ b/examples/new_member.py
@@ -15,4 +15,4 @@ async def on_ready():
     print(client.user.id)
     print('------')
 
-client.run('email', 'password')
+client.run('token')
diff --git a/examples/playlist.py b/examples/playlist.py
index 7a7eea3ec..3dc4cc114 100644
--- a/examples/playlist.py
+++ b/examples/playlist.py
@@ -100,4 +100,4 @@ class Bot(discord.Client):
 
 
 bot = Bot()
-bot.run('email', 'password')
+bot.run('token')
diff --git a/examples/reply.py b/examples/reply.py
index b111113ac..0413724c4 100644
--- a/examples/reply.py
+++ b/examples/reply.py
@@ -19,4 +19,4 @@ async def on_ready():
     print(client.user.id)
     print('------')
 
-client.run('email', 'password')
+client.run('token')