diff --git a/app/onboarding/views/index.py b/app/onboarding/views/index.py
index 5a247baa..794fc400 100644
--- a/app/onboarding/views/index.py
+++ b/app/onboarding/views/index.py
@@ -1,10 +1,9 @@
 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", is_user_logged_in=current_user is not None
+        "onboarding/index.html"
     )
diff --git a/templates/onboarding/index.html b/templates/onboarding/index.html
index d87821e4..cdc9f44c 100644
--- a/templates/onboarding/index.html
+++ b/templates/onboarding/index.html
@@ -19,7 +19,7 @@
   </div>
 
   <div class="mt-8 text-center">
-  {% if is_user_logged_in %}
+  {% if current_user != None and current_user.is_authenticated %}
     <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>
@@ -28,7 +28,7 @@
   </div>
 </div>
 
-  {% if is_user_logged_in %}
+  {% if current_user != None and current_user.is_authenticated %}
     <script type="text/javascript">
         setInterval(function() {
             const data = { tag: "PERFORM_EXTENSION_SETUP" };