diff --git a/public/403.html b/public/403.html
index 7164ea0d..d7c65139 100644
--- a/public/403.html
+++ b/public/403.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Error 403: Page not found</title>
+  <title>Error 403: Forbidden</title>
   <style type="text/css">
     body { background-color: #EFEFEF; color: #073642; font-family: arial, sans-serif; }
     div.dialog {
@@ -36,7 +36,7 @@
     <p><b>If you have other questions regarding OSEM...</b></p>
 
     <p>Feel free to contact contributors by subscribing to our <a href="http://lists.opensuse.org/opensuse-web/"> mailing list.</a><p>
-    
+
     <p>You can also reach out in the #OSEM channel on the IRC freenode
       server.</p>
 
diff --git a/public/500.html b/public/500.html
index f3648a0d..0f4c205b 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,25 +1,46 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>We're sorry, but something went wrong (500)</title>
+  <title>Error 500: Internal Server Error</title>
   <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    body { background-color: #EFEFEF; color: #073642; font-family: arial, sans-serif; }
     div.dialog {
-      width: 25em;
+      width: 80%;
+      max-width: 800px;
       padding: 0 4em;
       margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
+/*      border: 1px solid #ccc;
       border-right-color: #999;
-      border-bottom-color: #999;
+      border-bottom-color: #999;*/
     }
     h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
   </style>
 </head>
 
 <body>
-  <!-- This file lives in public/500.html -->
+  <!-- This file lives in public/404.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <img src="/img/osem-logo.png" alt="osem logo">
+    <h1>Error 500: Internal Server Error</h1>
+    
+    <p> It looks like something has gone wrong on our side.<br> We
+    recommend you <a href="https://github.com/openSUSE/osem/issues">submit an issue
+    on Github,</a> if one does not already exist regarding this. <br> If you'd like, you can start again from the <a href="/">homepage.</a></p><br>
+
+    <p>OSEM is a <a href="https://www.fsf.org/about/what-is-free-software">
+    free software</a> project built through collaboration.</p>
+
+    <p><b>If you believe you have encountered a bug...</b></p> 
+    
+    <p>Please <a href="https://github.com/openSUSE/osem/issues">submit an issue
+    on Github.</a></p>
+
+    <p><b>If you have other questions regarding OSEM...</b></p>
+
+    <p>Feel free to contact contributors by subscribing to our <a href="http://lists.opensuse.org/opensuse-web/"> mailing list.</a><p>
+    
+    <p>You can also reach out in the #OSEM channel on the IRC freenode
+      server.</p>
   </div>
 </body>
 </html>
