diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 708590e1b..ec440737e 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -544,9 +544,14 @@ Config =
         true
         'Link dead quotes to the archives.'
       ]
+      'Remember Your Posts': [
+        true
+        'Remember your posting history.'
+      ]
       'Mark Quotes of You': [
         true
         'Add \'(You)\' to quotes linking to your posts.'
+        1
       ]
       'Highlight Posts Quoting You': [
         true
@@ -555,7 +560,7 @@ Config =
       ]
       'Highlight Own Posts': [
         true
-        'Highlights own posts if Mark Quotes of You is enabled.'
+        'Highlights own posts.'
         1
       ]
       'Mark OP Quotes': [
diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index 8cde4a5fa..955aaa4e8 100644
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -339,6 +339,9 @@ Settings =
     if compareString < '00001.00011.00020.00004' or compareString is '00001.00011.00021.00000'
       if data['sauces']?
         changes['sauces'] = (changes['sauces'] ? data['sauces']).replace /^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg'
+    if compareString < '00001.00011.00021.00003'
+      unless data['Remember Your Posts']?
+        changes['Remember Your Posts'] = data['Mark Quotes of You'] ? true
     changes
 
   loadSettings: (data, cb) ->
diff --git a/src/Posting/PostSuccessful.coffee b/src/Posting/PostSuccessful.coffee
index 337a346cf..ca791b7e5 100644
--- a/src/Posting/PostSuccessful.coffee
+++ b/src/Posting/PostSuccessful.coffee
@@ -1,6 +1,6 @@
 PostSuccessful =
   init: ->
-    return unless Conf['Mark Quotes of You']
+    return unless Conf['Remember Your Posts']
     $.ready @ready
 
   ready: ->
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index a13b6adda..b2c335324 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -24,8 +24,8 @@ QR =
   init: ->
     return unless Conf['Quick Reply']
 
-    if Conf['Mark Quotes of You']
-      $.sync 'Mark Quotes of You', (enabled) -> Conf['Mark Quotes of You'] = enabled
+    if Conf['Remember Your Posts']
+      $.sync 'Remember Your Posts', (enabled) -> Conf['Remember Your Posts'] = enabled
       @db = new DataBoard 'yourPosts'
 
     @posts = []
@@ -769,8 +769,8 @@ QR =
     threadID = +threadID or postID
     isReply  = threadID isnt postID
 
-    $.forceSync 'Mark Quotes of You'
-    if Conf['Mark Quotes of You']
+    $.forceSync 'Remember Your Posts'
+    if Conf['Remember Your Posts']
       QR.db?.set
         boardID: g.BOARD.ID
         threadID: threadID
diff --git a/src/Quotelinks/QuoteBacklink.coffee b/src/Quotelinks/QuoteBacklink.coffee
index 1ee2036a4..17a5952df 100644
--- a/src/Quotelinks/QuoteBacklink.coffee
+++ b/src/Quotelinks/QuoteBacklink.coffee
@@ -22,7 +22,7 @@ QuoteBacklink =
       cb:   @secondNode
   firstNode: ->
     return if @isClone or !@quotes.length or @isRebuilt
-    markYours = QR.db?.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
+    markYours = Conf['Mark Quotes of You'] and QR.db?.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
     a = $.el 'a',
       href: Build.postURL @board.ID, @thread.ID, @ID
       className: if @isHidden then 'filtered backlink' else 'backlink'
diff --git a/src/Quotelinks/QuoteYou.coffee b/src/Quotelinks/QuoteYou.coffee
index fd14a2986..17621b771 100644
--- a/src/Quotelinks/QuoteYou.coffee
+++ b/src/Quotelinks/QuoteYou.coffee
@@ -1,6 +1,6 @@
 QuoteYou =
   init: ->
-    return unless g.VIEW in ['index', 'thread'] and Conf['Mark Quotes of You'] and Conf['Quick Reply']
+    return unless g.VIEW in ['index', 'thread'] and Conf['Remember Your Posts'] and Conf['Quick Reply']
 
     if Conf['Highlight Own Posts']
       $.addClass doc, 'highlight-own'
@@ -27,7 +27,7 @@ QuoteYou =
     return unless @quotes.length
 
     for quotelink in @nodes.quotelinks when QR.db.get Get.postDataFromLink quotelink
-        $.add quotelink, $.tn QuoteYou.text
+        $.add quotelink, $.tn QuoteYou.text if Conf['Mark Quotes of You']
         $.addClass quotelink, 'you'
         $.addClass @nodes.root, 'quotesYou'
     return