diff --git a/public/include/pages/admin/settings.inc.php b/public/include/pages/admin/settings.inc.php
index 1b761244..dca050f0 100644
--- a/public/include/pages/admin/settings.inc.php
+++ b/public/include/pages/admin/settings.inc.php
@@ -23,6 +23,7 @@ $smarty->assign("DISABLEINVITATIONS", $setting->getValue('disable_invitations'))
 $smarty->assign("DISABLEAP", $setting->getValue('disable_ap'));
 $smarty->assign("DISABLEMP", $setting->getValue('disable_mp'));
 $smarty->assign("DISABLENOTIFICATIONS", $setting->getValue('disable_notifications'));
+$smarty->assign("MOTD", $setting->getValue('system_motd'));
 
 // Tempalte specifics
 $smarty->assign("CONTENT", "default.tpl");
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 221e5a8e..64dcf2dc 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -120,6 +120,8 @@ if (@$_SESSION['USERDATA']['id']) {
 
 if ($setting->getValue('maintenance'))
   $_SESSION['POPUP'][] = array('CONTENT' => 'This pool is currently in maintenance mode.', 'TYPE' => 'warning');
+if ($motd = $setting->getValue('system_motd'))
+  $_SESSION['POPUP'][] = array('CONTENT' => $motd, 'TYPE' => 'info');
 
 // Make it available in Smarty
 $smarty->assign('PATH', 'site_assets/' . THEME);
diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index 81d109fa..eb0b7bc0 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -10,6 +10,13 @@
       <th>Value</th>
     </thead>
     <tbody>
+      <tr>
+        <td class="left">Message of the Day</td>
+        <td class="center"><span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Set a pool-wide message of the day.'></span></td>
+        <td>
+          <input name="data[system_motd]" value="{$MOTD|default:""}">
+        </td>
+      </tr>
       <tr>
         <td class="left">Maintenance Mode</td>
         <td class="center"><span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Enable Maintenance Mode for mmcfe-ng. Only admins can login.'></span></td>