diff --git a/templates/layouts/header.html b/templates/layouts/header.html
index d3a0d41..3a7eabd 100644
--- a/templates/layouts/header.html
+++ b/templates/layouts/header.html
@@ -2,8 +2,8 @@
     <div class="header-primary">
         <span id="logo">runnerspace</span>
         <div class="header-login">
-            {% if logged_in %}
-            Logged in as <a href="/user/{{ user.username }}" class="username">{{ user.username }}</a>
+            {% if current_user.is_authenticated %}
+            Logged in as <a href="/user/{{ current_user.username }}" class="username">{{ current_user.username }}</a>
             {% else %}
                 <a href="/login">Login</a> or <a href="/signup">Sign-up</a>!
             {% endif %}
diff --git a/templates/pages/signup.html b/templates/pages/signup.html
index 349487e..b470797 100644
--- a/templates/pages/signup.html
+++ b/templates/pages/signup.html
@@ -5,7 +5,7 @@
         {% with messages = get_flashed_messages() %}
             {% if messages %}
                 <div class="notification is-danger">
-                    {{ messages[0] }}. Go to <a href="{{ url_for('auth.login') }}">login page</a>.
+                    {{ messages[0] }}. Go to <a href="{{ url_for('main.login') }}">login page</a>.
                 </div>
             {% endif %}
         {% endwith %}