diff --git a/website/client/components/groups/chat.vue b/website/client/components/groups/chat.vue
new file mode 100644
index 0000000000..2ba54afb4e
--- /dev/null
+++ b/website/client/components/groups/chat.vue
@@ -0,0 +1,222 @@
+<template lang="pug">
+  .row.chat-row
+    .col-12
+      h3(v-once) {{ label }}
+
+      .row
+        textarea(:placeholder='placeholder',
+                  v-model='newMessage',
+                  :class='{"user-entry": newMessage}',
+                  @keydown='updateCarretPosition',
+                  @keyup.ctrl.enter='sendMessageShortcut()',
+                  @paste='disableMessageSendShortcut()'
+                )
+        autocomplete(
+                :text='newMessage',
+                v-on:select="selectedAutocomplete",
+                :coords='coords',
+                :chat='group.chat')
+
+      .row.chat-actions
+        .col-6.chat-receive-actions
+          button.btn.btn-secondary.float-left.fetch(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
+          button.btn.btn-secondary.float-left(v-once, @click='reverseChat()') {{ $t('reverseChat') }}
+        .col-6.chat-send-actions
+          button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
+
+      community-guidelines
+
+      slot(
+        name="additionRow",
+      )
+
+      .row
+        .hr.col-12
+        chat-message(:chat.sync='group.chat', :group-id='group._id', :group-name='group.name')
+</template>
+
+<script>
+  import debounce from 'lodash/debounce';
+
+  import autocomplete from '../chat/autoComplete';
+  import communityGuidelines from './communityGuidelines';
+  import chatMessage from '../chat/chatMessages';
+
+  export default {
+    props: ['label', 'group', 'placeholder'],
+    components: {
+      autocomplete,
+      communityGuidelines,
+      chatMessage,
+    },
+    data () {
+      return {
+        newMessage: '',
+        chat: {
+          submitDisable: false,
+          submitTimeout: null,
+        },
+        coords: {
+          TOP: 0,
+          LEFT: 0,
+        },
+      };
+    },
+    methods: {
+      // https://medium.com/@_jh3y/how-to-where-s-the-caret-getting-the-xy-position-of-the-caret-a24ba372990a
+      getCoord (e, text) {
+        let carPos = text.selectionEnd;
+        let div = document.createElement('div');
+        let span = document.createElement('span');
+        let copyStyle = getComputedStyle(text);
+
+        [].forEach.call(copyStyle, (prop) => {
+          div.style[prop] = copyStyle[prop];
+        });
+
+        div.style.position = 'absolute';
+        document.body.appendChild(div);
+        div.textContent = text.value.substr(0, carPos);
+        span.textContent = text.value.substr(carPos) || '.';
+        div.appendChild(span);
+        this.coords = {
+          TOP: span.offsetTop,
+          LEFT: span.offsetLeft,
+        };
+        document.body.removeChild(div);
+      },
+      updateCarretPosition: debounce(function updateCarretPosition (eventUpdate) {
+        this._updateCarretPosition(eventUpdate);
+      }, 250),
+      _updateCarretPosition (eventUpdate) {
+        let text = eventUpdate.target;
+        this.getCoord(eventUpdate, text);
+      },
+      async sendMessageShortcut () {
+        // If the user recently pasted in the text field, don't submit
+        if (!this.chat.submitDisable) {
+          this.sendMessage();
+        }
+      },
+      async sendMessage () {
+        let response = await this.$store.dispatch('chat:postChat', {
+          group: this.group,
+          message: this.newMessage,
+        });
+        this.group.chat.unshift(response.message);
+        this.newMessage = '';
+
+        // @TODO: I would like to not reload everytime we send. Realtime/Firebase?
+        let chat = await this.$store.dispatch('chat:getChat', {groupId: this.group._id});
+        this.group.chat = chat;
+      },
+
+      disableMessageSendShortcut () {
+        // Some users were experiencing accidental sending of messages after pasting
+        // So, after pasting, disable the shortcut for a second.
+        this.chat.submitDisable = true;
+
+        if (this.chat.submitTimeout) {
+          // If someone pastes during the disabled period, prevent early re-enable
+          clearTimeout(this.chat.submitTimeout);
+          this.chat.submitTimeout = null;
+        }
+
+        this.chat.submitTimeout = window.setTimeout(() => {
+          this.chat.submitTimeout = null;
+          this.chat.submitDisable = false;
+        }, 500);
+      },
+
+      selectedAutocomplete (newText) {
+        this.newMessage = newText;
+      },
+
+      fetchRecentMessages () {
+        this.$emit('fetchRecentMessages');
+      },
+      reverseChat () {
+        this.group.chat.reverse();
+      },
+    },
+    beforeRouteUpdate (to, from, next) {
+      // Reset chat
+      this.newMessage = '';
+      this.coords = {
+        TOP: 0,
+        LEFT: 0,
+      };
+
+      next();
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  @import '~client/assets/scss/colors.scss';
+  @import '~client/assets/scss/variables.scss';
+
+  .chat-actions {
+    margin-top: 1em;
+
+    .chat-receive-actions {
+      padding-left: 0;
+
+      button {
+        margin-bottom: 1em;
+
+        &:not(:last-child) {
+          margin-right: 1em;
+        }
+      }
+    }
+
+    .chat-send-actions {
+      padding-right: 0;
+    }
+  }
+
+  .chat-row {
+    position: relative;
+
+    textarea {
+      height: 150px;
+      width: 100%;
+      background-color: $white;
+      border: solid 1px $gray-400;
+      font-size: 16px;
+      font-style: italic;
+      line-height: 1.43;
+      color: $gray-300;
+      padding: .5em;
+    }
+
+    .user-entry {
+      font-style: normal;
+      color: $black;
+    }
+
+    .hr {
+      width: 100%;
+      height: 20px;
+      border-bottom: 1px solid $gray-500;
+      text-align: center;
+      margin: 2em 0;
+    }
+
+    .hr-middle {
+      font-size: 16px;
+      font-weight: bold;
+      font-family: 'Roboto Condensed';
+      line-height: 1.5;
+      text-align: center;
+      color: $gray-200;
+      background-color: $gray-700;
+      padding: .2em;
+      margin-top: .2em;
+      display: inline-block;
+      width: 100px;
+    }
+  }
+
+</style>
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index 3f61a5033f..28436ff084 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -27,25 +27,16 @@
               .svg-icon.gem(v-html="icons.gem")
               span.number {{group.balance * 4}}
               div(v-once) {{ $t('guildBank') }}
-    .row.chat-row
-      .col-12
-        h3(v-once) {{ $t('chat') }}
-        .row.new-message-row
-          textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition', @keyup.ctrl.enter='sendMessageShortcut()', @paste='disableMessageSendShortcut()')
-          autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat')
-        .row.chat-actions
-          .col-6.chat-receive-actions
-            button.btn.btn-secondary.float-left.fetch(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
-            button.btn.btn-secondary.float-left(v-once, @click='reverseChat()') {{ $t('reverseChat') }}
-          .col-6.chat-send-actions
-            button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
-        community-guidelines
+    chat(
+      :label="$t('chat')",
+      :group="group",
+      :placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')",
+      @fetchRecentMessages="fetchRecentMessages()"
+    )
+      template(slot="additionRow")
         .row(v-if='showNoNotificationsMessage')
           .col-12.no-notifications
             | {{$t('groupNoNotifications')}}
-        .row
-          .col-12.hr
-          chat-message(:chat.sync='group.chat', :group-id='group._id', :group-name='group.name')
   .col-12.col-sm-4.sidebar
     .row(:class='{"guild-background": !isParty}')
       .col-12
@@ -260,7 +251,6 @@
 <script>
 // @TODO: Break this down into components
 
-import debounce from 'lodash/debounce';
 import extend from 'lodash/extend';
 import groupUtilities from 'client/mixins/groupsUtilities';
 import styleHelper from 'client/mixins/styleHelper';
@@ -271,13 +261,11 @@ import startQuestModal from './startQuestModal';
 import questDetailsModal from './questDetailsModal';
 import groupFormModal from './groupFormModal';
 import inviteModal from './inviteModal';
-import chatMessage from '../chat/chatMessages';
-import autocomplete from '../chat/autoComplete';
 import groupChallenges from '../challenges/groupChallenges';
 import groupGemsModal from 'client/components/groups/groupGemsModal';
 import questSidebarSection from 'client/components/groups/questSidebarSection';
 import markdownDirective from 'client/directives/markdown';
-import communityGuidelines from './communityGuidelines';
+import chat from './chat';
 import sidebarSection from '../sidebarSection';
 import userLink from '../userLink';
 
@@ -300,16 +288,14 @@ export default {
     membersModal,
     startQuestModal,
     groupFormModal,
-    chatMessage,
     inviteModal,
     groupChallenges,
-    autocomplete,
     questDetailsModal,
     groupGemsModal,
     questSidebarSection,
-    communityGuidelines,
     sidebarSection,
     userLink,
+    chat,
   },
   directives: {
     markdown: markdownDirective,
@@ -337,11 +323,6 @@ export default {
         submitDisable: false,
         submitTimeout: null,
       },
-      newMessage: '',
-      coords: {
-        TOP: 0,
-        LEFT: 0,
-      },
     };
   },
   computed: {
@@ -392,13 +373,6 @@ export default {
   beforeRouteUpdate (to, from, next) {
     this.$set(this, 'searchId', to.params.groupId);
 
-    // Reset chat
-    this.newMessage = '';
-    this.coords = {
-      TOP: 0,
-      LEFT: 0,
-    };
-
     next();
   },
   watch: {
@@ -450,40 +424,6 @@ export default {
 
       return this.$store.dispatch('members:getGroupMembers', payload);
     },
-
-    // @TODO: abstract autocomplete
-    // https://medium.com/@_jh3y/how-to-where-s-the-caret-getting-the-xy-position-of-the-caret-a24ba372990a
-    getCoord (e, text) {
-      let carPos = text.selectionEnd;
-      let div = document.createElement('div');
-      let span = document.createElement('span');
-      let copyStyle = getComputedStyle(text);
-
-      [].forEach.call(copyStyle, (prop) => {
-        div.style[prop] = copyStyle[prop];
-      });
-
-      div.style.position = 'absolute';
-      document.body.appendChild(div);
-      div.textContent = text.value.substr(0, carPos);
-      span.textContent = text.value.substr(carPos) || '.';
-      div.appendChild(span);
-      this.coords = {
-        TOP: span.offsetTop,
-        LEFT: span.offsetLeft,
-      };
-      document.body.removeChild(div);
-    },
-    updateCarretPosition: debounce(function updateCarretPosition (eventUpdate) {
-      this._updateCarretPosition(eventUpdate);
-    }, 250),
-    _updateCarretPosition (eventUpdate) {
-      let text = eventUpdate.target;
-      this.getCoord(eventUpdate, text);
-    },
-    selectedAutocomplete (newText) {
-      this.newMessage = newText;
-    },
     showMemberModal () {
       this.$store.state.memberModalOptions.groupId = this.group._id;
       this.$store.state.memberModalOptions.group = this.group;
@@ -492,44 +432,9 @@ export default {
       this.$store.state.memberModalOptions.fetchMoreMembers = this.loadMembers;
       this.$root.$emit('bv::show::modal', 'members-modal');
     },
-    disableMessageSendShortcut () {
-      // Some users were experiencing accidental sending of messages after pasting
-      // So, after pasting, disable the shortcut for a second.
-      this.chat.submitDisable = true;
-
-      if (this.chat.submitTimeout) {
-        // If someone pastes during the disabled period, prevent early re-enable
-        clearTimeout(this.chat.submitTimeout);
-        this.chat.submitTimeout = null;
-      }
-
-      this.chat.submitTimeout = window.setTimeout(() => {
-        this.chat.submitTimeout = null;
-        this.chat.submitDisable = false;
-      }, 500);
-    },
-    async sendMessageShortcut () {
-      // If the user recently pasted in the text field, don't submit
-      if (!this.chat.submitDisable) {
-        this.sendMessage();
-      }
-    },
-    async sendMessage () {
-      if (!this.newMessage) return;
-
-      let response = await this.$store.dispatch('chat:postChat', {
-        group: this.group,
-        message: this.newMessage,
-      });
-      this.group.chat.unshift(response.message);
-      this.newMessage = '';
-    },
     fetchRecentMessages () {
       this.fetchGuild();
     },
-    reverseChat () {
-      this.group.chat.reverse();
-    },
     updateGuild () {
       this.$store.state.editingGroup = this.group;
       this.$root.$emit('bv::show::modal', 'guild-form');
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index 670e1deda8..eb4d3634d0 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -7,26 +7,12 @@
       .col-6.title-details
         h1(v-once) {{ $t('welcomeToTavern') }}
 
-    .row.chat-row
-      .col-12
-        h3(v-once) {{ $t('tavernChat') }}
-
-        .row
-          textarea(:placeholder="$t('tavernCommunityGuidelinesPlaceholder')", v-model='newMessage', :class='{"user-entry": newMessage}', @keydown='updateCarretPosition', @keyup.ctrl.enter='sendMessageShortcut()', @paste='disableMessageSendShortcut()')
-          autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat')
-
-        .row.chat-actions
-          .col-6.chat-receive-actions
-            button.btn.btn-secondary.float-left.fetch(v-once, @click='fetchRecentMessages()') {{ $t('fetchRecentMessages') }}
-            button.btn.btn-secondary.float-left(v-once, @click='reverseChat()') {{ $t('reverseChat') }}
-          .col-6.chat-send-actions
-            button.btn.btn-secondary.send-chat.float-right(v-once, @click='sendMessage()') {{ $t('send') }}
-
-        community-guidelines
-
-        .row
-          .hr.col-12
-          chat-message(:chat.sync='group.chat', :group-id='group._id', :group-name='group.name')
+    chat(
+      :label="$t('tavernChat')",
+      :group="group",
+      :placeholder="$t('tavernCommunityGuidelinesPlaceholder')",
+      @fetchRecentMessages="fetchRecentMessages()"
+    )
   .col-12.col-sm-4.sidebar
     .section
       .grassy-meadow-backdrop
@@ -179,69 +165,6 @@
   @import '~client/assets/scss/colors.scss';
   @import '~client/assets/scss/variables.scss';
 
-  .chat-actions {
-    margin-top: 1em;
-
-    .chat-receive-actions {
-      padding-left: 0;
-
-      button {
-        margin-bottom: 1em;
-
-        &:not(:last-child) {
-          margin-right: 1em;
-        }
-      }
-    }
-
-    .chat-send-actions {
-      padding-right: 0;
-    }
-  }
-
-  .chat-row {
-    position: relative;
-
-    textarea {
-      height: 150px;
-      width: 100%;
-      background-color: $white;
-      border: solid 1px $gray-400;
-      font-size: 16px;
-      font-style: italic;
-      line-height: 1.43;
-      color: $gray-300;
-      padding: .5em;
-    }
-
-    .user-entry {
-      font-style: normal;
-      color: $black;
-    }
-
-    .hr {
-      width: 100%;
-      height: 20px;
-      border-bottom: 1px solid $gray-500;
-      text-align: center;
-      margin: 2em 0;
-    }
-
-    .hr-middle {
-      font-size: 16px;
-      font-weight: bold;
-      font-family: 'Roboto Condensed';
-      line-height: 1.5;
-      text-align: center;
-      color: $gray-200;
-      background-color: $gray-700;
-      padding: .2em;
-      margin-top: .2em;
-      display: inline-block;
-      width: 100px;
-    }
-  }
-
   h1 {
     color: $purple-200;
   }
@@ -505,17 +428,15 @@
 </style>
 
 <script>
-import debounce from 'lodash/debounce';
 import { mapState } from 'client/libs/store';
 import { goToModForm } from 'client/libs/modform';
 
 import { TAVERN_ID } from '../../../common/script/constants';
-import chatMessage from '../chat/chatMessages';
-import autocomplete from '../chat/autoComplete';
-import communityGuidelines from './communityGuidelines';
 import worldBossInfoModal from '../world-boss/worldBossInfoModal';
 import worldBossRageModal from '../world-boss/worldBossRageModal';
 import sidebarSection from '../sidebarSection';
+import chat from './chat';
+
 
 import challengeIcon from 'assets/svg/challenge.svg';
 import chevronIcon from 'assets/svg/chevron-red.svg';
@@ -538,15 +459,14 @@ import tierNPC from 'assets/svg/tier-npc.svg';
 import tierStaff from 'assets/svg/tier-staff.svg';
 
 import quests from 'common/script/content/quests';
+import staffList from '../../libs/staffList';
 
 export default {
   components: {
-    chatMessage,
-    autocomplete,
-    communityGuidelines,
     worldBossInfoModal,
     worldBossRageModal,
     sidebarSection,
+    chat,
   },
   data () {
     return {
@@ -571,118 +491,13 @@ export default {
         tierNPC,
         tierStaff,
       }),
-      chat: {
-        submitDisable: false,
-        submitTimeout: null,
-      },
       group: {
         chat: [],
       },
       sections: {
         worldBoss: true,
       },
-      staff: [
-        {
-          name: 'beffymaroo',
-          type: 'Staff',
-          uuid: '9fe7183a-4b79-4c15-9629-a1aee3873390',
-        },
-        // {
-        //   name: 'lefnire',
-        //   type: 'Staff',
-        //   uuid: '00000000-0000-4000-9000-000000000000',
-        // },
-        {
-          name: 'Lemoness',
-          type: 'Staff',
-          uuid: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0',
-        },
-        {
-          name: 'paglias',
-          type: 'Staff',
-          uuid: 'ed4c688c-6652-4a92-9d03-a5a79844174a',
-        },
-        {
-          name: 'redphoenix',
-          type: 'Staff',
-          uuid: 'cb46ad54-8c78-4dbc-a8ed-4e3185b2b3ff',
-        },
-        {
-          name: 'SabreCat',
-          type: 'Staff',
-          uuid: '7f14ed62-5408-4e1b-be83-ada62d504931',
-        },
-        {
-          name: 'TheHollidayInn',
-          type: 'Staff',
-          uuid: '206039c6-24e4-4b9f-8a31-61cbb9aa3f66',
-        },
-        {
-          name: 'viirus',
-          type: 'Staff',
-          uuid: 'a327d7e0-1c2e-41be-9193-7b30b484413f',
-        },
-        {
-          name: 'It\'s Bailey',
-          type: 'Moderator',
-          uuid: '9da65443-ed43-4c21-804f-d260c1361596',
-        },
-        {
-          name: 'Alys',
-          type: 'Moderator',
-          uuid: 'd904bd62-da08-416b-a816-ba797c9ee265',
-        },
-        {
-          name: 'Blade',
-          type: 'Moderator',
-          uuid: '75f270e8-c5db-4722-a5e6-a83f1b23f76b',
-        },
-        {
-          name: 'Breadstrings',
-          type: 'Moderator',
-          uuid: '3b675c0e-d7a6-440c-8687-bc67cd0bf4e9',
-        },
-        {
-          name: 'Cantras',
-          type: 'Moderator',
-          uuid: '28771972-ca6d-4c03-8261-e1734aa7d21d',
-        },
-        // {
-        //   name: 'Daniel the Bard',
-        //   type: 'Moderator',
-        //   uuid: '1f7c4a74-03a3-4b2c-b015-112d0acbd593',
-        // },
-        {
-          name: 'deilann 5.0.5b',
-          type: 'Moderator',
-          uuid: 'e7b5d1e2-3b6e-4192-b867-8bafdb03eeec',
-        },
-        {
-          name: 'Dewines',
-          type: 'Moderator',
-          uuid: '262a7afb-6b57-4d81-88e0-80d2e9f6cbdc',
-        },
-        {
-          name: 'Fox_town',
-          type: 'Moderator',
-          uuid: 'a05f0152-d66b-4ef1-93ac-4adb195d0031',
-        },
-        {
-          name: 'Megan',
-          type: 'Moderator',
-          uuid: '73e5125c-2c87-4004-8ccd-972aeac4f17a',
-        },
-        {
-          name: 'shanaqui',
-          type: 'Moderator',
-          uuid: 'bb089388-28ae-4e42-a8fa-f0c2bfb6f779',
-        },
-      ],
-      newMessage: '',
-      coords: {
-        TOP: 0,
-        LEFT: 0,
-      },
+      staff: staffList,
     };
   },
   computed: {
@@ -699,81 +514,10 @@ export default {
     modForm () {
       goToModForm(this.user);
     },
-    // https://medium.com/@_jh3y/how-to-where-s-the-caret-getting-the-xy-position-of-the-caret-a24ba372990a
-    getCoord (e, text) {
-      let carPos = text.selectionEnd;
-      let div = document.createElement('div');
-      let span = document.createElement('span');
-      let copyStyle = getComputedStyle(text);
-
-      [].forEach.call(copyStyle, (prop) => {
-        div.style[prop] = copyStyle[prop];
-      });
-
-      div.style.position = 'absolute';
-      document.body.appendChild(div);
-      div.textContent = text.value.substr(0, carPos);
-      span.textContent = text.value.substr(carPos) || '.';
-      div.appendChild(span);
-      this.coords = {
-        TOP: span.offsetTop,
-        LEFT: span.offsetLeft,
-      };
-      document.body.removeChild(div);
-    },
-    updateCarretPosition: debounce(function updateCarretPosition (eventUpdate) {
-      this._updateCarretPosition(eventUpdate);
-    }, 250),
-    _updateCarretPosition (eventUpdate) {
-      let text = eventUpdate.target;
-      this.getCoord(eventUpdate, text);
-    },
-    selectedAutocomplete (newText) {
-      this.newMessage = newText;
-    },
     toggleSleep () {
       this.$store.dispatch('user:sleep');
     },
-    disableMessageSendShortcut () {
-      // Some users were experiencing accidental sending of messages after pasting
-      // So, after pasting, disable the shortcut for a second.
-      this.chat.submitDisable = true;
 
-      if (this.chat.submitTimeout) {
-        // If someone pastes during the disabled period, prevent early re-enable
-        clearTimeout(this.chat.submitTimeout);
-        this.chat.submitTimeout = null;
-      }
-
-      this.chat.submitTimeout = window.setTimeout(() => {
-        this.chat.submitTimeout = null;
-        this.chat.submitDisable = false;
-      }, 500);
-    },
-    async sendMessageShortcut () {
-      // If the user recently pasted in the text field, don't submit
-      if (!this.chat.submitDisable) {
-        this.sendMessage();
-      }
-    },
-    async sendMessage () {
-      let response = await this.$store.dispatch('chat:postChat', {
-        group: this.group,
-        message: this.newMessage,
-      });
-      this.group.chat.unshift(response.message);
-      this.newMessage = '';
-
-      // @TODO: I would like to not reload everytime we send. Realtime/Firebase?
-      let chat = await this.$store.dispatch('chat:getChat', {groupId: this.group._id});
-      this.group.chat = chat;
-    },
-    async fetchRecentMessages () {
-      this.group = await this.$store.dispatch('guilds:getGroup', {groupId: TAVERN_ID});
-    },
-    reverseChat () {
-      this.group.chat.reverse();
-    },
     pendingDamage () {
       if (!this.user.party.quest.progress.up) return 0;
       return this.$options.filters.floor(this.user.party.quest.progress.up, 10);
@@ -806,6 +550,10 @@ export default {
         startingPage: 'profile',
       });
     },
+
+    async fetchRecentMessages () {
+      this.group = await this.$store.dispatch('guilds:getGroup', {groupId: TAVERN_ID});
+    },
   },
 };
 </script>
diff --git a/website/client/libs/staffList.js b/website/client/libs/staffList.js
new file mode 100644
index 0000000000..96eb262fc3
--- /dev/null
+++ b/website/client/libs/staffList.js
@@ -0,0 +1,97 @@
+export default [
+  {
+    name: 'beffymaroo',
+    type: 'Staff',
+    uuid: '9fe7183a-4b79-4c15-9629-a1aee3873390',
+  },
+  // {
+  //   name: 'lefnire',
+  //   type: 'Staff',
+  //   uuid: '00000000-0000-4000-9000-000000000000',
+  // },
+  {
+    name: 'Lemoness',
+    type: 'Staff',
+    uuid: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0',
+  },
+  {
+    name: 'paglias',
+    type: 'Staff',
+    uuid: 'ed4c688c-6652-4a92-9d03-a5a79844174a',
+  },
+  {
+    name: 'redphoenix',
+    type: 'Staff',
+    uuid: 'cb46ad54-8c78-4dbc-a8ed-4e3185b2b3ff',
+  },
+  {
+    name: 'SabreCat',
+    type: 'Staff',
+    uuid: '7f14ed62-5408-4e1b-be83-ada62d504931',
+  },
+  {
+    name: 'TheHollidayInn',
+    type: 'Staff',
+    uuid: '206039c6-24e4-4b9f-8a31-61cbb9aa3f66',
+  },
+  {
+    name: 'viirus',
+    type: 'Staff',
+    uuid: 'a327d7e0-1c2e-41be-9193-7b30b484413f',
+  },
+  {
+    name: 'It\'s Bailey',
+    type: 'Moderator',
+    uuid: '9da65443-ed43-4c21-804f-d260c1361596',
+  },
+  {
+    name: 'Alys',
+    type: 'Moderator',
+    uuid: 'd904bd62-da08-416b-a816-ba797c9ee265',
+  },
+  {
+    name: 'Blade',
+    type: 'Moderator',
+    uuid: '75f270e8-c5db-4722-a5e6-a83f1b23f76b',
+  },
+  {
+    name: 'Breadstrings',
+    type: 'Moderator',
+    uuid: '3b675c0e-d7a6-440c-8687-bc67cd0bf4e9',
+  },
+  {
+    name: 'Cantras',
+    type: 'Moderator',
+    uuid: '28771972-ca6d-4c03-8261-e1734aa7d21d',
+  },
+  // {
+  //   name: 'Daniel the Bard',
+  //   type: 'Moderator',
+  //   uuid: '1f7c4a74-03a3-4b2c-b015-112d0acbd593',
+  // },
+  {
+    name: 'deilann 5.0.5b',
+    type: 'Moderator',
+    uuid: 'e7b5d1e2-3b6e-4192-b867-8bafdb03eeec',
+  },
+  {
+    name: 'Dewines',
+    type: 'Moderator',
+    uuid: '262a7afb-6b57-4d81-88e0-80d2e9f6cbdc',
+  },
+  {
+    name: 'Fox_town',
+    type: 'Moderator',
+    uuid: 'a05f0152-d66b-4ef1-93ac-4adb195d0031',
+  },
+  {
+    name: 'Megan',
+    type: 'Moderator',
+    uuid: '73e5125c-2c87-4004-8ccd-972aeac4f17a',
+  },
+  {
+    name: 'shanaqui',
+    type: 'Moderator',
+    uuid: 'bb089388-28ae-4e42-a8fa-f0c2bfb6f779',
+  },
+];
diff --git a/website/server/models/group.js b/website/server/models/group.js
index 8d98a1b1e7..65b49aee45 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -346,7 +346,11 @@ schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, use
 
   // Convert to timestamps because Android expects it
   toJSON.chat.forEach(chat => {
-    chat.timestamp = chat.timestamp ? chat.timestamp.getTime() : new Date().getTime();
+    // old chats are saved with a numeric timestamp
+    // new chats use `Date` which then has to be converted to the numeric timestamp
+    if (chat.timestamp.getTime) {
+      chat.timestamp = chat.timestamp.getTime();
+    }
   });
 
   return toJSON;
@@ -1537,4 +1541,4 @@ if (!nconf.get('IS_TEST')) {
       privacy: 'public',
     }).save();
   });
-}
\ No newline at end of file
+}