diff --git a/templates/yuuno/auth/login.twig b/templates/yuuno/auth/login.twig
index 79cb356..6fb66dc 100644
--- a/templates/yuuno/auth/login.twig
+++ b/templates/yuuno/auth/login.twig
@@ -3,7 +3,7 @@
 {% block title %}Login{% endblock %}
 
 {% block content %}
-    {% if config('require_activation') %}
+    {% if config('lock_authentication') %}
         <h1 class="stylised" style="line-height: 1.8em; text-align: center;">Logging in is disabled for security checkups! Try again later.</h1>
     {% else %}
         <div class="loginPage">
diff --git a/templates/yuuno/auth/reactivate.twig b/templates/yuuno/auth/reactivate.twig
index 5c0bb48..38a0b2b 100644
--- a/templates/yuuno/auth/reactivate.twig
+++ b/templates/yuuno/auth/reactivate.twig
@@ -3,7 +3,7 @@
 {% block title %}Reactivate account{% endblock %}
 
 {% block content %}
-    {% if config('require_activation') %}
+    {% if config('lock_authentication') %}
         <h1 class="stylised" style="line-height: 1.8em; text-align: center;">Reactivation is disabled for security checkups! Try again later.</h1>
     {% else %}
         <div class="loginPage">
diff --git a/templates/yuuno/auth/register.twig b/templates/yuuno/auth/register.twig
index 49320f3..42349d8 100644
--- a/templates/yuuno/auth/register.twig
+++ b/templates/yuuno/auth/register.twig
@@ -3,7 +3,7 @@
 {% block title %}Register{% endblock %}
 
 {% block content %}
-    {% if config('require_activation') or config('disable_registration') %}
+    {% if config('lock_authentication') or config('disable_registration') %}
     <div class="loginPage">
         <div class="registerForm" id="registerWarn" style="display: block;">
             <div class="centreAlign">
diff --git a/templates/yuuno/auth/resetpassword.twig b/templates/yuuno/auth/resetpassword.twig
index 4755f5a..fd4196f 100644
--- a/templates/yuuno/auth/resetpassword.twig
+++ b/templates/yuuno/auth/resetpassword.twig
@@ -3,7 +3,7 @@
 {% block title %}Reset Password{% endblock %}
 
 {% block content %}
-    {% if config('require_activation') %}
+    {% if config('lock_authentication') %}
         <h1 class="stylised" style="line-height: 1.8em; text-align: center;">Resetting password is disabled because of security checkups!</h1>
     {% else %}
     <div class="loginPage">
diff --git a/templates/yuuno/elements/indexPanel.twig b/templates/yuuno/elements/indexPanel.twig
index 92d7351..d4f8676 100644
--- a/templates/yuuno/elements/indexPanel.twig
+++ b/templates/yuuno/elements/indexPanel.twig
@@ -11,7 +11,7 @@
             </div>
         </div>
     {% else %}
-        {% if config('require_activation') %}
+        {% if config('lock_authentication') %}
             <div class="head">Whoops!</div>
             You caught the site at the wrong moment! Right now registration <i>and</i> logging in is disabled for unspecified reasons. Sorry for the inconvenience but please try again later!
             <div class="indexSidePanelLinks">
diff --git a/templates/yuuno/global/master.twig b/templates/yuuno/global/master.twig
index e2e64bb..5736e16 100644
--- a/templates/yuuno/global/master.twig
+++ b/templates/yuuno/global/master.twig
@@ -103,8 +103,8 @@
                             <a class="menu-item fa-cogs" href="{{ route('settings.index') }}" title="Settings"></a>
                             <a class="menu-item fa-sign-out" href="{{ route('auth.logout') }}?s={{ session_id() }}" title="Logout" id="headerLogoutLink"></a>
                         {% else %}
-                            {% if config('require_activation') %}
-                                <div class="menu-item fa-lock" style="padding-left: 10px; padding-right: 10px;" title="Authentication is locked"></div>
+                            {% if config('lock_authentication') %}
+                                <a class="menu-item fa-lock" style="cursor: default;" title="Authentication is locked"></a>
                             {% else %}
                                 <a class="menu-item fa-magic" href="{{ route('auth.register') }}" title="Register"></a>
                                 <a class="menu-item fa-sign-in" href="{{ route('auth.login') }}" title="Login"></a>