diff --git a/admin/configuration.php b/admin/configuration.php
index e34aa13..02eb69d 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -254,7 +254,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
                                           action="<?php echo $_SERVER['PHP_SELF']; ?>">
 
                                         <div class="checkbox checkbox-primary">
-                                            <input <?php if ($disableguest == "on") echo 'checked="true"'; ?>
+                                            <input <?php if ($site_disable_guests) echo 'checked="true"'; ?>
                                                     type="checkbox" name="disableguest" id="disableguest">
                                             <label for="disableguest">
                                                 Only allow registered users to paste
diff --git a/includes/common.php b/includes/common.php
index 0df4d6a..d0e9f43 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -114,11 +114,9 @@ $lang_and_theme = $site_info['interface'];
 $default_lang = $lang_and_theme['language'];
 $default_theme = $lang_and_theme['theme'];
 
-// site permissions
+// Site permissions
 $site_permissions = $site_info['permissions'];
 
-// $siteprivate, $privatesite
-// $disableguest, $noguests
 if ($site_permissions) {
     $site_is_private = (bool) $site_permissions['private'];
     $site_disable_guest = (bool) $site_permissions['disable_guest'];
@@ -129,7 +127,7 @@ if ($site_permissions) {
 
 // CAPTCHA configuration
 $captcha_config = $site_info['captcha'];
-$captcha_enabled = (bool)$captcha_config['enabled'];
+$captcha_enabled = (bool) $captcha_config['enabled'];
 
 // Prevent a potential LFI (you never know :p)
 $lang_file = "${default_lang}.php";
diff --git a/theme/bulma/main.php b/theme/bulma/main.php
index abe9df9..881a59f 100644
--- a/theme/bulma/main.php
+++ b/theme/bulma/main.php
@@ -57,7 +57,7 @@ function setupTagsInput() {
         <div class="bd-duo">
             <div class="bd-lead">
                 <!-- Guests -->
-                <?php if (isset($noguests) && $noguests == "on") { // Site permissions
+                <?php if ($site_disable_guests) { // Site permissions
                     ?>
                     <section class="hero is-medium">
                         <div class="">