diff --git a/core/lib/Thelia/Admin/Controller/AdminController.php b/core/lib/Thelia/Admin/Controller/AdminController.php
index 39cdfb4fc..bb5536c7e 100755
--- a/core/lib/Thelia/Admin/Controller/AdminController.php
+++ b/core/lib/Thelia/Admin/Controller/AdminController.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Admin\Controller;
 
+use Symfony\Component\HttpFoundation\Response;
 use Thelia\Form\AdminLogin;
 
 class AdminController extends BaseAdminController {
@@ -55,4 +56,12 @@ class AdminController extends BaseAdminController {
 
         return $adminLogin->buildForm($form, array())->getForm();
     }
+
+    public function lostAction()
+    {
+        return new Response(
+            $this->renderRaw("404.html"),
+            404
+        );
+    }
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 171763f56..90ecd0c1a 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -10,4 +10,8 @@
     <route id="admin.login" path="/admin/login">
         <default key="_controller">Thelia\Admin\Controller\AdminController::loginAction</default>
     </route>
+    <route id="admin.lost" path="/admin/{everything}">
+        <default key="_controller">Thelia\Admin\Controller\AdminController::lostAction</default>
+        <requirement key="everything">.*</requirement>
+    </route>
 </routes>
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
index 4418bd50c..f79f98a1a 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
@@ -35,7 +35,7 @@ class Assetic implements SmartyPluginInterface
     {
         $web_root  = THELIA_WEB_DIR;
 
-        $asset_dir_from_web_root = 'assets/admin/default'; // FIXME
+        $asset_dir_from_web_root = '/assets/admin/default'; // FIXME
 
         $this->asset_manager = new SmartyAssetsManager($web_root, $asset_dir_from_web_root);
     }
diff --git a/templates/admin/default/404.html b/templates/admin/default/404.html
new file mode 100644
index 000000000..5704c8125
--- /dev/null
+++ b/templates/admin/default/404.html
@@ -0,0 +1,14 @@
+{$page_title={intl l='Thelia'}}
+{include file='includes/header.inc.html'}
+
+    <div class="brandbar container">
+        <a class="brand" href="index.php">{images file='assets/img/logo-thelia-34px.png'}<img src="{$asset_url}" alt="{intl l='Thelia, solution e-commerce libre'}" />{/images}</a>
+    </div>
+
+    <div id="wrapper" class="container">
+        <h1>Oops! An Error Occurred</h1>
+        <h2>The server returned a "404 Not Found".</h2>
+    </div>
+
+
+{include file='includes/footer.inc.html'}
\ No newline at end of file
diff --git a/web/.htaccess b/web/.htaccess
index 4336ad269..57b1cf491 100755
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -1,4 +1,4 @@
-Options +FollowSymlinks
+Options +FollowSymlinks -Indexes
 
 AddDefaultCharset UTF-8
 
@@ -8,5 +8,5 @@ AddDefaultCharset UTF-8
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
 
-	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
+	RewriteRule ^(.*)$ index_dev.php [L,QSA]
 </IfModule>
\ No newline at end of file