diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index 48032a83b3..cc8c5073fa 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -1,4 +1,4 @@
-
+
{motd}
diff --git a/src/routes/api.js b/src/routes/api.js
index b3c9afde81..f52b43d273 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -51,8 +51,10 @@ var user = require('./../user.js'),
}
async.each(data.categories, iterator, function (err) {
- data.motd_class = (meta.config.show_motd === '1' || meta.config.show_motd === undefined) ? '' : 'none';
- data.motd = require('marked')(meta.config.motd || "# NodeBB
v " + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future.\n\n
");
+ data.motd_class = (meta.config.show_motd === '1' || meta.config.show_motd === undefined) ? '' : ' none';
+ data.motd_class += (meta.config.motd.length > 0 ? '' : ' default');
+
+ data.motd = require('marked')(meta.config.motd || "
\n\n# NodeBB
v" + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future.");
res.json(data);
});