diff --git a/templates/main.html b/templates/main.html
index ab7e54ff..6e686e6f 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -14,28 +14,28 @@
     </h1>
     <div class="two-columns">
         <div class="left">
-            {% if not g.logged_in %}
+            {% if not g.user %}
                 {% include "components/welcome.html" %}
             {% endif %}
-            {% if g.logged_in %}
+            {% if g.user %}
                 {% if events %}
                     {% include "components/eventlist.html" %}
                 {% endif %}
             {% endif %}
             {% include "components/memberbox.html" %}
-            {% if g.logged_in %}
+            {% if g.user %}
                 {% include "components/wikibox.html" %}
             {% endif %}
         </div>
         <div class="right">
-            {% if not g.logged_in %}
+            {% if not g.user %}
                 {% include "components/whatarewe.html" %}
             {% endif %}
-            {% if g.logged_in %}
+            {% if g.user %}
                 {% include "components/questboard.html" %}
             {% endif %}
             {% include "components/gamestatsbox.html" %}
-            {% if g.logged_in %}
+            {% if g.user %}
                 {% include "components/links.html" %}
                 {% include "components/diariooftheday.html" %}
             {% endif %}
diff --git a/templates/wikipage.html b/templates/wikipage.html
index 5b4e22ca..1ac06bd7 100644
--- a/templates/wikipage.html
+++ b/templates/wikipage.html
@@ -43,7 +43,7 @@
                 Ultima modifica di <span class="last-author"><a href="/profile/{{ wiki_log.editor.username }}">{{ wiki_log.editor.username }}</a></span> alle <span class="last-timestamp">{{ wiki_log.timestamp.strftime('%Y-%m-%d %H:%M:%S %Z') }}</span>{% if wiki_log.reason %}, motivo: <span class="last-reason">{{ wiki_log.reason }}</span>{% endif %}
             </div>
         {% endif %}
-        {% if session.get('user_id', '') %}
+        {% if g.user %}
             <div class="wiki-edit">
                 <h4>Modifica</h4>
                 <form action="{{ url_for('page_wiki', key=key) }}" method="POST">