diff --git a/public/.htaccess b/public/.htaccess
index 1caaddc0..9750f3bb 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,3 +1,4 @@
+ErrorDocument 404 /index.php?page=error&action=404
 RedirectMatch 404 /templates(/|$)
 RedirectMatch 404 /include(/|$)
 RedirectMatch 404 /.git(/|$)
diff --git a/public/include/pages/error.inc.php b/public/include/pages/error.inc.php
new file mode 100644
index 00000000..aecab054
--- /dev/null
+++ b/public/include/pages/error.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+    die('Hacking attempt');
+
+// Tempalte specifics
+$smarty->assign("CONTENT", "default.tpl");
+?>
diff --git a/public/include/pages/error/404.inc.php b/public/include/pages/error/404.inc.php
new file mode 100644
index 00000000..aecab054
--- /dev/null
+++ b/public/include/pages/error/404.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+    die('Hacking attempt');
+
+// Tempalte specifics
+$smarty->assign("CONTENT", "default.tpl");
+?>
diff --git a/public/templates/mpos/error/404/default.tpl b/public/templates/mpos/error/404/default.tpl
new file mode 100644
index 00000000..36f017b7
--- /dev/null
+++ b/public/templates/mpos/error/404/default.tpl
@@ -0,0 +1,6 @@
+<article class="module width_full">
+  <header><h3>{$GLOBAL.website.name}</h3></header>
+  <div class="module_content">
+    <p>The page you requested was not found.</p>
+  </div>
+</article>
diff --git a/public/templates/mpos/error/default.tpl b/public/templates/mpos/error/default.tpl
new file mode 100644
index 00000000..36f017b7
--- /dev/null
+++ b/public/templates/mpos/error/default.tpl
@@ -0,0 +1,6 @@
+<article class="module width_full">
+  <header><h3>{$GLOBAL.website.name}</h3></header>
+  <div class="module_content">
+    <p>The page you requested was not found.</p>
+  </div>
+</article>