diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vue
index 5bbd1678b..cf5276174 100644
--- a/frontend/src/views/Dashboard.vue
+++ b/frontend/src/views/Dashboard.vue
@@ -3,5 +3,23 @@
   <v-toolbar flat>
     <v-toolbar-title><translate>Welcome to Modoboa</translate></v-toolbar-title>
   </v-toolbar>
+  <v-alert
+    type="info"
+    border="top"
+    colored-border
+    elevation="2"
+    class="mt-10"
+    >
+    <translate tag="p">This page is still in construction.</translate>
+    <translate tag="p">
+      It will present a summary of your Modoboa server's status and
+      some useful information about the product.
+    </translate>
+    <p>
+      Your feedback would be really appreciated, you can
+      use <a href="https://github.com/modoboa/modoboa/discussions">Github
+      discussions</a> to share your ideas and/or comments.
+    </p>
+  </v-alert>
 </div>
 </template>
diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index a58591ab6..acbbee19b 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -41,7 +41,13 @@
         />
     </validation-observer>
     <div class="d-flex justify-center">
-      <v-btn class="flex-grow-1" color="primary" large @click="authenticate">
+      <v-btn
+        class="flex-grow-1"
+        color="primary"
+        large
+        @click="authenticate"
+        :loading="loading"
+        >
         <translate>Connect</translate>
       </v-btn>
     </div>
@@ -56,6 +62,7 @@ import auth from '@/api/auth'
 export default {
   data () {
     return {
+      loading: false,
       rememberMe: false,
       username: '',
       password: '',
@@ -72,13 +79,15 @@ export default {
         username: this.username,
         password: this.password
       }
+      this.loading = true
       auth.requestToken(payload).then(resp => {
         Cookies.set('token', resp.data.access, { sameSite: 'strict' })
         Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
         this.$store.dispatch('auth/initialize').then(() => {
-          this.$router.push({ name: 'Dashboard' })
+          this.$router.push({ name: 'DomainList' })
         })
       }).catch(err => {
+        this.loading = false
         if (err.response.status === 401) {
           this.$refs.observer.setErrors({
             password: this.$gettext('Invalid username and/or password')
diff --git a/frontend/src/views/TwoFA.vue b/frontend/src/views/TwoFA.vue
index 3c304b8e3..3c509dfc3 100644
--- a/frontend/src/views/TwoFA.vue
+++ b/frontend/src/views/TwoFA.vue
@@ -57,7 +57,7 @@ export default {
         Cookies.set('token', resp.data.access, { sameSite: 'strict' })
         Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
         this.$store.dispatch('auth/initialize').then(() => {
-          this.$router.push({ name: 'Dashboard' })
+          this.$router.push({ name: 'DomainList' })
         })
       }).catch(error => {
         this.$refs.observer.setErrors(error.response.data)
diff --git a/modoboa/admin/api/v1/tests.py b/modoboa/admin/api/v1/tests.py
index 002498254..2617cedd3 100644
--- a/modoboa/admin/api/v1/tests.py
+++ b/modoboa/admin/api/v1/tests.py
@@ -71,7 +71,7 @@ class DomainAPITestCase(ModoAPITestCase):
             url, {"name": "test4.com", "default_mailbox_quota": 10})
         self.assertEqual(response.status_code, 403)
 
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     @mock.patch("socket.getaddrinfo")
     def test_create_domain_with_mx_check(self, mock_getaddrinfo, mock_query):
         """Check domain creation when MX check is activated."""
diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 65da58381..116bc9b6b 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -203,7 +203,7 @@ class DomainTestCase(ModoTestCase):
         self.assertContains(response, "value=\"500\"")
         self.assertContains(response, "value=\"50\"")
 
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     @mock.patch("socket.getaddrinfo")
     def test_create_and_check_mx(self, mock_getaddrinfo, mock_query):
         """Check for authorized MX record."""
diff --git a/modoboa/admin/tests/test_import_.py b/modoboa/admin/tests/test_import_.py
index 9ce2e5d88..6c4ab117e 100644
--- a/modoboa/admin/tests/test_import_.py
+++ b/modoboa/admin/tests/test_import_.py
@@ -78,7 +78,7 @@ domainalias; domalias1.com; domain1.com; True
             response,
             "Default mailbox quota cannot be greater than domain quota")
 
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     @mock.patch("socket.getaddrinfo")
     def test_domain_import_with_mx_check(self, mock_getaddrinfo, mock_query):
         """Check domain import when MX check is enabled."""
diff --git a/modoboa/core/templates/core/dashboard.html b/modoboa/core/templates/core/dashboard.html
index 4af723b3a..6169b6341 100644
--- a/modoboa/core/templates/core/dashboard.html
+++ b/modoboa/core/templates/core/dashboard.html
@@ -5,6 +5,10 @@
 {% block pagetitle %}{% trans "Dashboard" %}{% endblock %}
 
 {% block container_content %}
+  <div class="alert alert-warning text-center">
+    <strong>Want to check the new admin interface?</strong>
+    <a class="btn btn-default" style="margin-left: 20px;" href="/new-admin" target="_blank">Go to Modoboa v2</a>
+  </div>
 
   <div class="row">
     <div class="col-xs-12 col-sm-offset-1 col-sm-10">