diff --git a/app/onboarding/views/index.py b/app/onboarding/views/index.py
index 41f04d79..5a247baa 100644
--- a/app/onboarding/views/index.py
+++ b/app/onboarding/views/index.py
@@ -1,9 +1,10 @@
 from app.onboarding.base import onboarding_bp
 from flask import render_template
+from flask_login import current_user
 
 
 @onboarding_bp.route("/", methods=["GET"])
 def index():
     return render_template(
-        "onboarding/index.html",
+        "onboarding/index.html", is_user_logged_in=current_user is not None
     )
diff --git a/templates/onboarding/index.html b/templates/onboarding/index.html
index 359a0c49..eb2a1679 100644
--- a/templates/onboarding/index.html
+++ b/templates/onboarding/index.html
@@ -13,39 +13,28 @@
     </a>
   </div>
 
-
-  <div id="loading-section" class="mt-8 mb-4 text-center">
-    <h3>Loading...</h3>
+  <!-- Text container -->
+  <div class="mt-8 mb-4 text-center">
+    <h2 class="text-dark" style="font-size:2rem">Let's take back control of your inbox!</h2>
   </div>
 
-  <div id="content-section" style="display: none">
-    <!-- Text container -->
-    <div class="mt-8 mb-4 text-center">
-      <h2 class="text-dark" style="font-size:2rem">Let's take back control of your inbox!</h2>
-    </div>
-
-    <!-- Button container -->
-    <div class="mt-8 text-center">
-      <a class="mx-6 p-4 text-decoration-none" style="background:black;color:white;" href="{{ url_for('auth.register', next=url_for('onboarding.setup_done')) }}">Create a new account</a>
-      <a class="mx-6 p-4 text-decoration-none" style="background:white;color:black;border-radius: 2px;border:1px solid black;" href="{{ url_for('auth.login', next=url_for('onboarding.setup_done')) }}">I already have an account</a>
-    </div>
+  <div class="mt-8 text-center">
+  {% if is_user_logged_in %}
+    <h2 class="text-black-50" style="font-size:2rem">Performing the extension setup...</h2>
+  {% else %}
+    <a class="mx-6 p-4 text-decoration-none" style="background:black;color:white;" href="{{ url_for('auth.register', next=url_for('onboarding.setup_done')) }}">Create a new account</a>
+    <a class="mx-6 p-4 text-decoration-none" style="background:white;color:black;border-radius: 2px;border:1px solid black;" href="{{ url_for('auth.login', next=url_for('onboarding.setup_done')) }}">I already have an account</a>
+  {% endif %}
   </div>
-
 </div>
 
-<script type="text/javascript">
-  setTimeout(function() {
-    const data = { tag: "PERFORM_EXTENSION_SETUP" };
-    window.postMessage(data, "/");
-  }, 300); // Give some time to the extension for registering the listener
-
-  setTimeout(function() {
-    const loadingSection = document.getElementById("loading-section");
-    const contentSection = document.getElementById("content-section");
-
-    loadingSection.style.display = "none";
-    contentSection.style.display = "block";
-  }, 1500); // If in this time the extension has not been able to perform the setup, show the buttons
-</script>
+  {% if is_user_logged_in %}
+    <script type="text/javascript">
+        setInterval(function() {
+            const data = { tag: "PERFORM_EXTENSION_SETUP" };
+            window.postMessage(data, "/");
+        }, 300); // Give some time to the extension for registering the listener
+    </script>
+  {% endif %}
 
 {% endblock %}
\ No newline at end of file