diff --git a/package.json b/package.json
index b0bd05f..a5132f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rainbox.email",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "ISP mail provider manager with mysql and integrated LDAP server",
   "repository": "https://gitlab.com/ArisuOngaku/rainbox.email",
   "author": "Alice Gaudon <alice@gaudon.pro>",
diff --git a/src/App.ts b/src/App.ts
index aff252d..f71cd99 100644
--- a/src/App.ts
+++ b/src/App.ts
@@ -137,12 +137,12 @@ export default class App extends Application {
         this.use(new BackendController());
         this.use(new MailboxBackendController());
         this.use(new AuthController());
+        this.use(new MailAutoConfigController()); // Needs to override MailController
 
         // Core functionality
         this.use(new MailController());
 
         // Other functionnality
-        this.use(new MailAutoConfigController());
 
         // Semi-static routes
         this.use(new HomeController());