diff --git a/models/forms/makepost.js b/models/forms/makepost.js
index 66d65dda..b86028fd 100644
--- a/models/forms/makepost.js
+++ b/models/forms/makepost.js
@@ -13,7 +13,7 @@ const path = require('path')
 	, simpleMarkdown = require(__dirname+'/../../helpers/posting/markdown.js')
 	, sanitizeOptions = require(__dirname+'/../../helpers/posting/sanitizeoptions.js')
 	, sanitize = require('sanitize-html')
-	, nameRegex = /^(?<name>[^\s#]+)?(?:##(?<tripcode>[^ ]{1}[^\s#]+))?(?:## (?<capcode>[^\s#]+))?$/
+	, nameRegex = /^(?<name>[^\s#]+)?(?:##(?<tripcode>[^ ]{1}[^\s#]+))?(?:## (?<capcode>[^#]+))?$/
 	, imageUpload = require(__dirname+'/../../helpers/files/imageupload.js')
 	, videoUpload = require(__dirname+'/../../helpers/files/videoupload.js')
 	, fileCheckMimeType = require(__dirname+'/../../helpers/files/mimetypes.js')
@@ -284,6 +284,7 @@ module.exports = async (req, res, next) => {
 			}
 			//capcode
 			if (res.locals.permLevel < 4 && groups.capcode) {
+				groups.capcode = groups.capcode.trim();
 				let type = '';
 				switch (res.locals.permLevel) {
 					case 3://board mod