diff --git a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.html b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.html
index 763d9b74..2aaa6583 100644
--- a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.html
+++ b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.html
@@ -1,34 +1,27 @@
 <!DOCTYPE html>
-<html lang="en"
-	xmlns:wicket="http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=blob_plain;f=wicket-core/src/main/resources/META-INF/wicket-1.5.xsd;hb=master">
-<head>
-<meta charset="utf-8">
-<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-<link href="vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
-<title>Error</title>
-</head>
-
+<html xmlns:wicket="http://wicket.apache.org">
 <body>
-	<div class="container">
-		<div class="page-header">
-			<h1>An unexpected error occured</h1>
+	<wicket:extend>
+		<div class="container">
+			<div class="page-header">
+				<h1>An unexpected error occured</h1>
+			</div>
+	
+			<div class="alert alert-error" style="cursor: pointer"
+				data-toggle="collapse" data-target="#stacktrace">
+				<ul class="feedbackPanel unstyled" style="margin-bottom: 0px;">
+					<li class="feedbackPanelERROR">
+						<span class="feedbackPanelERROR" wicket:id="message"></span>
+					</li>
+				</ul>
+			</div>
+	
+			Go back to the <a href="javascript:window.history.back()">previous page</a> or to the <a wicket:id="homepage">home page.</a>
+	
+			<div id="stacktrace" class="collapse">
+				<pre wicket:id="stacktrace"></pre>
+			</div>
 		</div>
-
-		<div class="alert alert-error" style="cursor: pointer"
-			data-toggle="collapse" data-target="#stacktrace">
-			<ul class="feedbackPanel unstyled" style="margin-bottom: 0px;">
-				<li class="feedbackPanelERROR">
-					<span class="feedbackPanelERROR" wicket:id="message"></span>
-				</li>
-			</ul>
-		</div>
-
-		Go back to the <a href="javascript:window.history.back()">previous page</a> or to the <a wicket:id="homepage">home page.</a>
-
-		<div id="stacktrace" class="collapse">
-			<pre wicket:id="stacktrace"></pre>
-		</div>
-	</div>
-	<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+	</wicket:extend>
 </body>
 </html>
diff --git a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java
index 76ab7655..02955180 100644
--- a/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java
+++ b/src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java
@@ -4,13 +4,13 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 
+import com.commafeed.frontend.pages.BasePage;
 import com.commafeed.frontend.references.bootstrap.BootstrapReference;
 
-public class DisplayExceptionPage extends WebPage {
+public class DisplayExceptionPage extends BasePage {
 
 	private static final long serialVersionUID = 1L;
 
