diff --git a/backend/src/data/GuildNicknameHistory.ts b/backend/src/data/GuildNicknameHistory.ts
index 9f75d24e..e0cf7cfb 100644
--- a/backend/src/data/GuildNicknameHistory.ts
+++ b/backend/src/data/GuildNicknameHistory.ts
@@ -17,7 +17,7 @@ if (!isAPI()) {
   setTimeout(cleanup, 30 * SECONDS);
 }
 
-export const MAX_NICKNAME_ENTRIES_PER_USER = 10;
+export const MAX_NICKNAME_ENTRIES_PER_USER = 20;
 
 export class GuildNicknameHistory extends BaseGuildRepository {
   private nicknameHistory: Repository<NicknameHistoryEntry>;
diff --git a/backend/src/data/UsernameHistory.ts b/backend/src/data/UsernameHistory.ts
index 7aa4331a..bcd3ba9d 100644
--- a/backend/src/data/UsernameHistory.ts
+++ b/backend/src/data/UsernameHistory.ts
@@ -17,7 +17,7 @@ if (!isAPI()) {
   setTimeout(cleanup, 30 * SECONDS);
 }
 
-export const MAX_USERNAME_ENTRIES_PER_USER = 5;
+export const MAX_USERNAME_ENTRIES_PER_USER = 20;
 
 export class UsernameHistory extends BaseRepository {
   private usernameHistory: Repository<UsernameHistoryEntry>;
diff --git a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts
index 0efb5fe3..250cace5 100644
--- a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts
+++ b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts
@@ -35,9 +35,8 @@ export const NameHistoryPlugin = zeppelinGuildPlugin<NameHistoryPluginType>()({
 
   // prettier-ignore
   events: [
-    // FIXME: Temporary
-    // ChannelJoinEvt,
-    // MessageCreateEvt,
+    ChannelJoinEvt,
+    MessageCreateEvt,
   ],
 
   beforeLoad(pluginData) {