diff --git a/.gitignore b/.gitignore
index e8cb92653e..9373b18930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ plugins/*
 !plugins/talk-plugin-google-auth
 !plugins/talk-plugin-ignore-user
 !plugins/talk-plugin-like
+!plugins/talk-plugin-local-auth
 !plugins/talk-plugin-love
 !plugins/talk-plugin-member-since
 !plugins/talk-plugin-mod
@@ -50,10 +51,11 @@ plugins/*
 !plugins/talk-plugin-notifications-digest-hourly
 !plugins/talk-plugin-offtopic
 !plugins/talk-plugin-permalink
-!plugins/talk-plugin-profile-settings
 !plugins/talk-plugin-profile-data
+!plugins/talk-plugin-profile-settings
 !plugins/talk-plugin-remember-sort
 !plugins/talk-plugin-respect
+!plugins/talk-plugin-rich-text
 !plugins/talk-plugin-slack-notifications
 !plugins/talk-plugin-sort-most-downvoted
 !plugins/talk-plugin-sort-most-liked
@@ -67,7 +69,6 @@ plugins/*
 !plugins/talk-plugin-toxic-comments
 !plugins/talk-plugin-upvote
 !plugins/talk-plugin-viewing-options
-!plugins/talk-plugin-rich-text
 
 **/node_modules/*
 yarn-error.log
diff --git a/plugins.default.json b/plugins.default.json
index e1011aa872..0fbc6e6587 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -1,9 +1,9 @@
 {
   "server": [
-    "talk-plugin-auth",
     "talk-plugin-featured-comments",
-    "talk-plugin-respect",
-    "talk-plugin-profile-data"
+    "talk-plugin-local-auth",
+    "talk-plugin-profile-data",
+    "talk-plugin-respect"
   ],
   "client": [
     "talk-plugin-auth",
@@ -11,15 +11,16 @@
     "talk-plugin-featured-comments",
     "talk-plugin-flag-details",
     "talk-plugin-ignore-user",
+    "talk-plugin-local-auth",
     "talk-plugin-member-since",
     "talk-plugin-moderation-actions",
     "talk-plugin-permalink",
+    "talk-plugin-profile-data",
     "talk-plugin-respect",
     "talk-plugin-sort-most-replied",
     "talk-plugin-sort-most-respected",
     "talk-plugin-sort-newest",
     "talk-plugin-sort-oldest",
-    "talk-plugin-viewing-options",
-    "talk-plugin-profile-data"
+    "talk-plugin-viewing-options"
   ]
 }
diff --git a/plugins/talk-plugin-auth/README.md b/plugins/talk-plugin-auth/README.md
index 0a00db5ea2..fd5218365a 100644
--- a/plugins/talk-plugin-auth/README.md
+++ b/plugins/talk-plugin-auth/README.md
@@ -7,7 +7,6 @@ plugin:
     default: true
     provides:
         - Client
-        - Server
 ---
 
 This provides the base plugin that is the basis for all auth based plugins that
diff --git a/plugins/talk-plugin-auth/index.js b/plugins/talk-plugin-auth/index.js
index 7e4ee6a3c3..f053ebf797 100644
--- a/plugins/talk-plugin-auth/index.js
+++ b/plugins/talk-plugin-auth/index.js
@@ -1,11 +1 @@
-const typeDefs = require('./server/typeDefs');
-const resolvers = require('./server/resolvers');
-const mutators = require('./server/mutators');
-const path = require('path');
-
-module.exports = {
-  translations: path.join(__dirname, 'server', 'translations.yml'),
-  typeDefs,
-  mutators,
-  resolvers,
-};
+module.exports = {};
diff --git a/plugins/talk-plugin-local-auth/README.md b/plugins/talk-plugin-local-auth/README.md
new file mode 100644
index 0000000000..ee5a6b8806
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/README.md
@@ -0,0 +1,20 @@
+---
+title: talk-plugin-local-auth
+permalink: /plugin/talk-plugin-local-auth/
+layout: plugin
+plugin:
+    name: talk-plugin-local-auth
+    default: true
+    provides:
+        - Client
+        - Server
+---
+
+This plugin will eventually contain all the local authentication code that is
+responsible for creating, resetting, and managing accounts provided locally
+through an email and password based login.
+
+## Features
+
+- *Email Change*: Allows users to change their existing email address on their account.
+- *Local Account Association*: Allows users that have signed up with an external auth strategy (such as Google) the ability to associate a email address and password for login. **Note: Existing users with external authentication will be prompted to setup a local account when they sign in and when new users create an account.**
diff --git a/plugins/talk-plugin-local-auth/index.js b/plugins/talk-plugin-local-auth/index.js
new file mode 100644
index 0000000000..7e4ee6a3c3
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/index.js
@@ -0,0 +1,11 @@
+const typeDefs = require('./server/typeDefs');
+const resolvers = require('./server/resolvers');
+const mutators = require('./server/mutators');
+const path = require('path');
+
+module.exports = {
+  translations: path.join(__dirname, 'server', 'translations.yml'),
+  typeDefs,
+  mutators,
+  resolvers,
+};
diff --git a/plugins/talk-plugin-auth/server/errors.js b/plugins/talk-plugin-local-auth/server/errors.js
similarity index 100%
rename from plugins/talk-plugin-auth/server/errors.js
rename to plugins/talk-plugin-local-auth/server/errors.js
diff --git a/plugins/talk-plugin-auth/server/mutators.js b/plugins/talk-plugin-local-auth/server/mutators.js
similarity index 100%
rename from plugins/talk-plugin-auth/server/mutators.js
rename to plugins/talk-plugin-local-auth/server/mutators.js
diff --git a/plugins/talk-plugin-auth/server/resolvers.js b/plugins/talk-plugin-local-auth/server/resolvers.js
similarity index 100%
rename from plugins/talk-plugin-auth/server/resolvers.js
rename to plugins/talk-plugin-local-auth/server/resolvers.js
diff --git a/plugins/talk-plugin-auth/server/translations.yml b/plugins/talk-plugin-local-auth/server/translations.yml
similarity index 100%
rename from plugins/talk-plugin-auth/server/translations.yml
rename to plugins/talk-plugin-local-auth/server/translations.yml
diff --git a/plugins/talk-plugin-auth/server/typeDefs.graphql b/plugins/talk-plugin-local-auth/server/typeDefs.graphql
similarity index 100%
rename from plugins/talk-plugin-auth/server/typeDefs.graphql
rename to plugins/talk-plugin-local-auth/server/typeDefs.graphql
diff --git a/plugins/talk-plugin-auth/server/typeDefs.js b/plugins/talk-plugin-local-auth/server/typeDefs.js
similarity index 100%
rename from plugins/talk-plugin-auth/server/typeDefs.js
rename to plugins/talk-plugin-local-auth/server/typeDefs.js