diff --git a/helpers/quotes.js b/helpers/quotes.js
index 92a1928b..fcd1fac9 100644
--- a/helpers/quotes.js
+++ b/helpers/quotes.js
@@ -77,7 +77,7 @@ module.exports = async (board, text) => {
 			const quotenum = +match.substring(2);
 			if (postThreadIdMap[board] && postThreadIdMap[board][quotenum]) {
 				threadQuotes.push(quotenum)
-				return `<a class='quote' href='/${board}/thread/${postThreadIdMap[board][quotenum]}.html#${quotenum}'>&gt;&gt;${quotenum}</a>`;
+				return `<a class='quote' href='/${board}/thread/${postThreadIdMap[board][quotenum]}.html#${quotenum}'>&gt;&gt;${quotenum}</a>${postThreadIdMap[board][quotenum] === quotenum ? ' <small>(OP)</small> ' : ''}`;
 			}
 			return match;
 		});
@@ -96,6 +96,6 @@ module.exports = async (board, text) => {
 		});
 	}
 
-	return { quotedMessage: text, threadQuotes };
+	return { quotedMessage: text, threadQuotes: [...new Set(threadQuotes)] };
 
 }
diff --git a/models/forms/make-post.js b/models/forms/make-post.js
index f1fee629..977950db 100644
--- a/models/forms/make-post.js
+++ b/models/forms/make-post.js
@@ -12,7 +12,7 @@ const path = require('path')
 	, simpleMarkdown = require(__dirname+'/../../helpers/markdown.js')
 	, sanitize = require('sanitize-html')
 	, sanitizeOptions = {
-		allowedTags: [ 'span', 'a', 'em', 'strong' ],
+		allowedTags: [ 'span', 'a', 'em', 'strong', 'small' ],
 		allowedAttributes: {
 			'a': [ 'href', 'class' ],
 			'span': [ 'class' ]