diff --git a/assets/javascripts/discourse/assigned-messages-route-map.js.es6 b/assets/javascripts/discourse-assign/assigned-messages-route-map.js.es6
similarity index 100%
rename from assets/javascripts/discourse/assigned-messages-route-map.js.es6
rename to assets/javascripts/discourse-assign/assigned-messages-route-map.js.es6
diff --git a/assets/javascripts/discourse/assigns-activity-route-map.js.es6 b/assets/javascripts/discourse-assign/assigns-activity-route-map.js.es6
similarity index 100%
rename from assets/javascripts/discourse/assigns-activity-route-map.js.es6
rename to assets/javascripts/discourse-assign/assigns-activity-route-map.js.es6
diff --git a/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-button.hbs b/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
similarity index 100%
rename from assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
rename to assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
diff --git a/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-button.js.es6 b/assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.js.es6
similarity index 100%
rename from assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-button.js.es6
rename to assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.js.es6
diff --git a/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.hbs b/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
similarity index 100%
rename from assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.hbs
rename to assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
diff --git a/assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.hbs b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
similarity index 100%
rename from assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.hbs
rename to assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
diff --git a/assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.js.es6 b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js.es6
similarity index 100%
rename from assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.js.es6
rename to assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js.es6
diff --git a/assets/javascripts/discourse/controllers/assign-user.js.es6 b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
similarity index 100%
rename from assets/javascripts/discourse/controllers/assign-user.js.es6
rename to assets/javascripts/discourse-assign/controllers/assign-user.js.es6
diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6 b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
similarity index 95%
rename from assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
rename to assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
index aba9e9b..0a378b9 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
+++ b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6
@@ -17,7 +17,7 @@ function initialize(api, container) {
     _createContent() {
       this._super();
 
-      if (!this.get('currentUser.staff')) {
+      if (!this.get('currentUser.staff') || !siteSettings.assign_enabled) {
         return;
       }
       const content = this.get('content');
@@ -75,7 +75,7 @@ function initialize(api, container) {
 
   });
 
-  if (currentUser && currentUser.get("staff")) {
+  if (currentUser && currentUser.get("staff") && siteSettings.assign_enabled) {
     api.addUserMenuGlyph({
       label: 'discourse_assign.assigned',
       className: 'assigned',
diff --git a/assets/javascripts/discourse/routes/user-activity-assigned.js.es6 b/assets/javascripts/discourse-assign/routes/user-activity-assigned.js.es6
similarity index 100%
rename from assets/javascripts/discourse/routes/user-activity-assigned.js.es6
rename to assets/javascripts/discourse-assign/routes/user-activity-assigned.js.es6
diff --git a/assets/javascripts/discourse/routes/user-private-messages-assigned.js.es6 b/assets/javascripts/discourse-assign/routes/user-private-messages-assigned.js.es6
similarity index 100%
rename from assets/javascripts/discourse/routes/user-private-messages-assigned.js.es6
rename to assets/javascripts/discourse-assign/routes/user-private-messages-assigned.js.es6
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse-assign/templates/modal/assign-user.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/modal/assign-user.hbs
rename to assets/javascripts/discourse-assign/templates/modal/assign-user.hbs
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b482ff4..838b2a0 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1,5 +1,6 @@
 en:
   site_settings:
+    assign_enabled: "Enable the assign plugin"
     assigns_public: "Allow general public to see topic assignments"
     assigns_user_url_path: "Path to users assigned topics (use: {username} to substitute username)"
     assigns_by_staff_mention: "If a staff member mentions another staff member, topic is automatically assigned"
diff --git a/config/settings.yml b/config/settings.yml
index b8a9391..d0da05b 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,4 +1,7 @@
 plugins:
+  assign_enabled:
+    default: false
+    client: true
   assigns_by_staff_mention: false
   unassign_creates_tracking_post: true
   assigns_public: false
diff --git a/plugin.rb b/plugin.rb
index 4e80e04..4532b5c 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -3,6 +3,8 @@
 # version: 0.1
 # authors: Sam Saffron
 
+enabled_site_setting :assign_enabled
+
 register_asset 'stylesheets/assigns.scss'
 
 after_initialize do