diff --git a/app/http/endpoints/api/team/addmember.go b/app/http/endpoints/api/team/addmember.go
index ee61783..dfa0a04 100644
--- a/app/http/endpoints/api/team/addmember.go
+++ b/app/http/endpoints/api/team/addmember.go
@@ -29,6 +29,11 @@ func AddMember(ctx *gin.Context) {
 		return
 	}
 
+	if entityType == entityTypeRole && snowflake == guildId {
+		ctx.JSON(400, utils.ErrorStr("You cannot add the @everyone role as staff"))
+		return
+	}
+
 	teamId := ctx.Param("teamid")
 	if teamId == "default" {
 		addDefaultMember(ctx, guildId, snowflake, entityType)
@@ -85,4 +90,4 @@ func addTeamMember(ctx *gin.Context, teamId int, guildId, snowflake uint64, enti
 	}
 
 	ctx.JSON(200, utils.SuccessResponse)
-}
\ No newline at end of file
+}
diff --git a/chatreplica/convert_v1.go b/chatreplica/convert_v1.go
index 5310fe8..0a3eec1 100644
--- a/chatreplica/convert_v1.go
+++ b/chatreplica/convert_v1.go
@@ -34,17 +34,17 @@ func FromArchiveMessages(messages []message.Message, ticketId int) Payload {
 				badge = badgePtr(BadgeBot)
 			}
 
-            users[snowflake] = User{
+			users[snowflake] = User{
 				Avatar:        msg.Author.AvatarUrl(256),
 				Username:      msg.Author.Username,
-				Discriminator: msg.Author.Discriminator,
+				Discriminator: fmt.Sprintf("%04d", msg.Author.Discriminator),
 				Badge:         badge,
 			}
-        }
+		}
 	}
 
 	return Payload{
-		Entities:    Entities{
+		Entities: Entities{
 			Users:    users,
 			Channels: make(map[string]Channel),
 			Roles:    make(map[string]Role),