diff --git a/modoboa/static/css/admin.css b/modoboa/admin/static/admin/css/admin.css
similarity index 100%
rename from modoboa/static/css/admin.css
rename to modoboa/admin/static/admin/css/admin.css
diff --git a/modoboa/static/js/admin.js b/modoboa/admin/static/admin/js/admin.js
similarity index 99%
rename from modoboa/static/js/admin.js
rename to modoboa/admin/static/admin/js/admin.js
index f0568db64..0b8d7d512 100644
--- a/modoboa/static/js/admin.js
+++ b/modoboa/admin/static/admin/js/admin.js
@@ -129,7 +129,7 @@ function importform_cb() {
         }
         $("#import_status").css("display", "block");
         $("#import_result").html("").removeClass("alert alert-error");
-        $("form").submit();
+        $("#importform").submit();
     });
 }
 
diff --git a/modoboa/admin/templates/admin/header.html b/modoboa/admin/templates/admin/header.html
index 1e35ffc95..d020aed58 100644
--- a/modoboa/admin/templates/admin/header.html
+++ b/modoboa/admin/templates/admin/header.html
@@ -1,5 +1,5 @@
 {% extends "twocols.html" %}
 {% block html_head %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/admin.css" />
-<script type="text/javascript" src="{{ STATIC_URL }}js/admin.js"></script>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}admin/css/admin.css" />
+<script type="text/javascript" src="{{ STATIC_URL }}admin/js/admin.js"></script>
 {% endblock %}