diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index e25420d025c..f209d5cc84e 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -116,6 +116,10 @@ Discourse.ComposerController = Discourse.Controller.extend({
   }.property('content.composeState', 'content.reply', 'educationClosed', 'educationContents'),
 
   fetchNewUserEducation: function() {
+
+    // We don't show education when editing a post.
+    if (this.get('content.editingPost')) return;
+
     // If creating a topic, use topic_count, otherwise post_count
     var count = this.get('content.creatingTopic') ? Discourse.get('currentUser.topic_count') : Discourse.get('currentUser.reply_count');
     if (count >= Discourse.SiteSettings.educate_until_posts) {
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 6f88b332dd3..a93a14b4941 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -121,6 +121,7 @@ class PostCreator
       # Track the topic
       TopicUser.auto_track(@user.id, topic.id, TopicUser.notification_reasons[:created_post])
 
+      # We don't count replies to your own topics
       if @user.id != topic.user_id
         @user.update_topic_reply_count
       end