diff --git a/app/post.go b/app/post.go
index 720bbd43d6..f9018bf18a 100644
--- a/app/post.go
+++ b/app/post.go
@@ -2170,10 +2170,12 @@ func (a *App) CheckPostReminders() {
 					"PostId":   postID,
 					"Username": metadata.Username,
 				}),
-				Type:   model.PostTypeDefault,
+				Type:   model.PostTypeReminder,
 				UserId: systemBot.UserId,
 				Props: model.StringInterface{
-					"username": systemBot.Username,
+					"team_name": metadata.TeamName,
+					"post_id":   postID,
+					"username":  metadata.Username,
 				},
 			}
 
diff --git a/model/post.go b/model/post.go
index e7c11edc44..0cf604f032 100644
--- a/model/post.go
+++ b/model/post.go
@@ -415,6 +415,7 @@ func (o *Post) IsValid(maxPostSize int) *AppError {
 		PostTypeAddBotTeamsChannels,
 		PostTypeSystemWarnMetricStatus,
 		PostTypeWelcomePost,
+		PostTypeReminder,
 		PostTypeMe:
 	default:
 		if !strings.HasPrefix(o.Type, PostCustomTypePrefix) {