2 files changed, 19 insertions, 5 deletions
diff --git a/ishtar_common/templates/404.html b/ishtar_common/templates/404.html
index 82cdd0fb4..f2c57d496 100644
--- a/ishtar_common/templates/404.html
+++ b/ishtar_common/templates/404.html
@@ -1,8 +1,5 @@
-{% load i18n %}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
+{% load i18n %}<!doctype html>
+<html lang="en">
 <head>
     <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png">
     <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
diff --git a/ishtar_common/templates/500.html b/ishtar_common/templates/500.html
new file mode 100644
index 000000000..dbe2278a7
--- /dev/null
+++ b/ishtar_common/templates/500.html
@@ -0,0 +1,17 @@
+{% load i18n %}<!doctype html>
+<html lang="en">
+<head>
+    <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png">
+    <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
+    </title>
+    <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css?ver={{VERSION}}" />
+</head>
+<body>
+<div>
+  <h3>{% trans "An error has occured. The support team has been warned." %}</h3>
+  <p><a href='/'>{% trans "Back to main page" %}</a></p>
+</div>
+</body>
+
+</html>
+