diff --git a/website/public/.htaccess b/website/public/.htaccess
index f08898a..5b6a2ef 100644
--- a/website/public/.htaccess
+++ b/website/public/.htaccess
@@ -1,7 +1,7 @@
 Options +FollowSymLinks
 RewriteEngine On
 
-ErrorDocument 404 /error404.jpg
+ErrorDocument 404 /error/404.php
 
 RewriteCond %{SCRIPT_FILENAME} !-d
 RewriteCond %{SCRIPT_FILENAME} !-f
diff --git a/website/public/error/404.php b/website/public/error/404.php
new file mode 100644
index 0000000..673fbc0
--- /dev/null
+++ b/website/public/error/404.php
@@ -0,0 +1,9 @@
+<?php
+require_once "../../views/messagepage.php";
+
+messagePage("
+<div class='error-page'>
+    <h1>404</h1>
+    <h4>Wrong link...</h4><br />
+    <img height='486' width='204' src='../img/zelda.png'>
+</div>");
\ No newline at end of file
diff --git a/website/public/img/zelda.png b/website/public/img/zelda.png
new file mode 100644
index 0000000..0c1580a
Binary files /dev/null and b/website/public/img/zelda.png differ
diff --git a/website/public/styles/resetpassword.css b/website/public/styles/message-page.css
similarity index 64%
rename from website/public/styles/resetpassword.css
rename to website/public/styles/message-page.css
index a3d7942..7cc6f4b 100644
--- a/website/public/styles/resetpassword.css
+++ b/website/public/styles/message-page.css
@@ -1,6 +1,9 @@
+body {
+    background-color: #FBC02D;
+}
+
 .password-change {
     height: 100%;
-    background-color: #FBC02D;
     margin: auto;
 }
 
@@ -12,6 +15,14 @@
     margin: 30px auto auto;
     display: block;
 }
-.password-change img {
+.top-logo img {
     width: 50%;
 }
+
+.error-page {
+    text-align: center;
+}
+
+.error-page img {
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/website/views/messagepage.php b/website/views/messagepage.php
index 2dfc871..70268b9 100644
--- a/website/views/messagepage.php
+++ b/website/views/messagepage.php
@@ -5,14 +5,14 @@ function messagePage(string $content) {
     <html>
     <head>
         <style>
-            @import url(styles/main.css);
-            @import url(styles/settings.css);
-            @import url(styles/resetpassword.css);
+            @import url(../styles/main.css);
+            @import url(../styles/settings.css);
+            @import url(../styles/message-page.css);
         </style>
     </head>
     <body>
     <div class='password-change'>
-        <div class='top-logo'><a href='login.php'><img src='img/top-logo.png' alt='MyHyvesbook+'/></a></div>
+        <div class='top-logo'><a href='../login.php'><img src='../img/top-logo.png' alt='MyHyvesbook+'/></a></div>
         <div class='item-box platform'>$content</div>
     </div>
     </body>
