diff --git a/models/forms/changeglobalsettings.js b/models/forms/changeglobalsettings.js
index 933913d9..a543a13a 100644
--- a/models/forms/changeglobalsettings.js
+++ b/models/forms/changeglobalsettings.js
@@ -13,7 +13,7 @@ module.exports = async (req, res, next) => {
 	const oldSettings = await cache.get('globalsettings');
 	const newSettings = {
 //		'captchaMode': typeof req.body.captcha_mode === 'number' && req.body.captcha_mode !== oldSettings.captchaMode ? req.body.captcha_mode : oldSettings.captchaMode,
-		'filters': req.body.filters !== null ? req.body.filters.split('\r\n').filter(n => n).slice(0,50) : oldSettings.filters,
+		'filters': req.body.filters !== null ? req.body.filters.split(/\r?\n/).filter(n => n) : oldSettings.filters,
 		'filterMode': typeof req.body.filter_mode === 'number' && req.body.filter_mode !== oldSettings.filterMode ? req.body.filter_mode : oldSettings.filterMode,
 		'filterBanDuration': typeof req.body.ban_duration === 'number' && req.body.ban_duration !== oldSettings.filterBanDuration ? req.body.ban_duration : oldSettings.filterBanDuration,
 	};
diff --git a/models/forms/create.js b/models/forms/create.js
index 932fc543..01706c2e 100644
--- a/models/forms/create.js
+++ b/models/forms/create.js
@@ -11,7 +11,7 @@ module.exports = async (req, res, next) => {
 
 	const { name, description } = req.body
 		, uri = req.body.uri.toLowerCase()
-		, tags = req.body.tags.split('\n').filter(n => n)
+		, tags = req.body.tags.split(/\r?\n/).filter(n => n)
 		, owner = req.session.user;
 
 	if (restrictedURIs.has(uri)) {