diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index aa1fd28e..e34ebc75 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -9,10 +9,8 @@ var validator = require('validator'),
  * Render the main application page
  */
 exports.renderIndex = function (req, res) {
-  var safeUserObject = null;
+  var safeUserObject = req.user || null;
   if (req.user) {
-    safeUserObject = req.user;
-
     var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
     req.user.addSignedIp(ip);
   }
@@ -28,7 +26,12 @@ exports.renderIndex = function (req, res) {
  * Render the server error page
  */
 exports.renderServerError = function (req, res) {
+  var safeUserObject = req.user || null;
+
   res.status(500).render('modules/core/server/views/500', {
+    user: JSON.stringify(safeUserObject),
+    sharedConfig: JSON.stringify(config.shared),
+    meanTorrentConfig: JSON.stringify(config.meanTorrentConfig),
     error: 'Oops! Something went wrong...'
   });
 };
@@ -38,10 +41,14 @@ exports.renderServerError = function (req, res) {
  * Performs content-negotiation on the Accept HTTP header
  */
 exports.renderNotFound = function (req, res) {
+  var safeUserObject = req.user || null;
 
   res.status(404).format({
     'text/html': function () {
       res.render('modules/core/server/views/404', {
+        user: JSON.stringify(safeUserObject),
+        sharedConfig: JSON.stringify(config.shared),
+        meanTorrentConfig: JSON.stringify(config.meanTorrentConfig),
         url: req.originalUrl
       });
     },
diff --git a/modules/core/server/views/500.server.view.html b/modules/core/server/views/500.server.view.html
index 36f02a5d..cc438ec4 100644
--- a/modules/core/server/views/500.server.view.html
+++ b/modules/core/server/views/500.server.view.html
@@ -4,7 +4,7 @@
 <section>
     <div class="container">
         <div class="page-header">
-            <h1>Server Error</h1>
+            <h2>Server Error</h2>
         </div>
         <pre>
           {{error}}