diff --git a/package.json b/package.json
index aa2b796071..0e47780a71 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.1",
     "nodebb-rewards-essentials": "0.0.3",
     "nodebb-theme-lavender": "1.0.49",
-    "nodebb-theme-persona": "2.0.12",
-    "nodebb-theme-vanilla": "3.0.6",
+    "nodebb-theme-persona": "2.0.13",
+    "nodebb-theme-vanilla": "3.0.7",
     "nodebb-widget-essentials": "1.0.4",
     "npm": "^2.1.4",
     "passport": "^0.2.1",
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 70854a548a..e7ca7e075f 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -110,6 +110,9 @@ Controllers.register = function(req, res, next) {
 			}
 		},
 		function(next) {
+			plugins.fireHook('filter:parse.post', {postData: {content: meta.config.termsOfUse}}, next);
+		},
+		function(tos, next) {
 			var loginStrategies = require('../routes/authentication').getLoginStrategies();
 			var data = {
 				'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12',
@@ -121,7 +124,7 @@ Controllers.register = function(req, res, next) {
 			data.minimumUsernameLength = meta.config.minimumUsernameLength;
 			data.maximumUsernameLength = meta.config.maximumUsernameLength;
 			data.minimumPasswordLength = meta.config.minimumPasswordLength;
-			data.termsOfUse = meta.config.termsOfUse;
+			data.termsOfUse = tos.postData.content;
 			data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
 			data.regFormEntry = [];
 			data.error = req.flash('error')[0];