diff --git a/tools/redditcrawl.py b/tools/redditcrawl.py
index cf942c93..750f8211 100755
--- a/tools/redditcrawl.py
+++ b/tools/redditcrawl.py
@@ -88,8 +88,8 @@ def set_flair(submission, flair):
 			break
 		else:
 			continue
-
-	if (submission.link_flair_text == "New Entry"):
+	
+	if submission.link_flair_text == "New Entry" or submission.link_flair_text == "Edit Entry":
 
 		try:
 
@@ -106,24 +106,40 @@ def set_flair(submission, flair):
 
 			if submission_json:
 
-				submission_json_dummy = {"id": submission.id, "edit": True, "contributors": []}
+				if submission.link_flair_text == "Edit Entry":
+
+					assert submission_json["id"] != 0, "ID is tampered, it must not be 0!"
+					submission_json_dummy = {"id": submission_json["id"], "edit": True, "contributors": []}
+
+					if "submitted_by" in submission_json:
+						submission_json_dummy["contributors"].append(submission_json['submitted_by'])
+						del submission_json['submitted_by']
+					elif "contributors" in submission_json:
+						submission_json_dummy["contributors"] = submission_json["contributors"]
+
+					try:
+						if not submission.author.name in submission_json_dummy:
+							submission_json_dummy["contributors"].append(submission.author.name)
+					except AttributeError:
+						submission_json_dummy["contributors"].append("unknown")
 
-				if (submission_json.id != 0):
-					submission_json_dummy["id"] = submission_json.id
 				else:
-					del submission_json_dummy["edit"]
 
-				if "submitted_by" in submission_json:
-					submission_json_dummy["contributors"].append(submission_json['submitted_by'])
-					del submission_json['submitted_by']
-				elif "contributors" in submission_json:
-					submission_json_dummy["contributors"] = submission_json["contributors"]
+					assert submission_json["id"] == 0, "ID is tampered, it must be 0!"
+					submission_json_dummy = {"id": submission.id, "contributors": []}
+
+					if "submitted_by" in submission_json:
+						submission_json_dummy["contributors"].append(submission_json['submitted_by'])
+						del submission_json['submitted_by']
+					elif "contributors" in submission_json:
+						submission_json_dummy["contributors"] = submission_json["contributors"]
+
+					try:
+						if not submission.author.name in submission_json_dummy:
+							submission_json_dummy["contributors"].append(submission.author.name)
+					except AttributeError:
+						submission_json_dummy["contributors"].append("unknown")
 
-				try:
-					if not submission.author.name in submission_json_dummy:
-						submission_json_dummy["contributors"].append(submission.author.name)
-				except AttributeError:
-					submission_json_dummy["contributors"].append("unknown")
 
 				for key in submission_json:
 					if not key in submission_json_dummy: