diff --git a/reserve.txt b/reserve.txt
index c8608a7..6b49e19 100644
--- a/reserve.txt
+++ b/reserve.txt
@@ -27,11 +27,14 @@ a
 t
 d
 te
+tag
 author
 type
 state
 id
 username
+bot
+discriminator
 timestamp
 content
 editedTimestamp
diff --git a/src/tracker/savefile.js b/src/tracker/savefile.js
index 623638e..193a00b 100644
--- a/src/tracker/savefile.js
+++ b/src/tracker/savefile.js
@@ -6,7 +6,8 @@
  *   meta: {
  *     users: {
  *       <discord user id>: {
- *         name: <user name>
+ *         name: <user name>,
+ *         tag: <user discriminator> // only present if not a bot
  *       }, ...
  *     },
  *
@@ -102,12 +103,16 @@ class SAVEFILE{
     return parsedObj && typeof parsedObj.meta === "object" && typeof parsedObj.data === "object";
   }
   
-  findOrRegisterUser(userId, userName){
+  findOrRegisterUser(userId, userName, userDiscriminator){
     if (!(userId in this.meta.users)){
       this.meta.users[userId] = {
         "name": userName
       };
       
+      if (userDiscriminator){
+        this.meta.users[userId].tag = userDiscriminator;
+      }
+
       this.meta.userindex.push(userId);
       return this.tmp.userlookup[userId] = this.meta.userindex.length-1;
     }
@@ -163,8 +168,10 @@ class SAVEFILE{
   }
   
   convertToMessageObject(discordMessage){
+    var author = discordMessage.author;
+    
     var obj = {
-      u: this.findOrRegisterUser(discordMessage.author.id, discordMessage.author.username),
+      u: this.findOrRegisterUser(author.id, author.username, author.bot ? null : author.discriminator),
       t: discordMessage.timestamp.toDate().getTime()
     };