diff --git a/src/app/Traits/SettingsTrait.php b/src/app/Traits/SettingsTrait.php
index e8b2e36d..96888d34 100644
--- a/src/app/Traits/SettingsTrait.php
+++ b/src/app/Traits/SettingsTrait.php
@@ -1,134 +1,134 @@
 <?php
 
 namespace App\Traits;
 
 trait SettingsTrait
 {
     /**
      * Obtain the value for a setting.
      *
      * Example Usage:
      *
      * ```php
      * $user = User::firstOrCreate(['email' => 'some@other.erg']);
      * $locale = $user->getSetting('locale');
      * ```
      *
      * @param string $key     Setting name
      * @param mixed  $default Default value, to be used if not found
      *
      * @return string|null Setting value
      */
     public function getSetting(string $key, $default = null)
     {
         $setting = $this->settings()->where('key', $key)->first();
 
         return $setting ? $setting->value : $default;
     }
 
     /**
      * Obtain the values for many settings in one go (for better performance).
      *
      * @param array $keys Setting names
      *
      * @return array Setting key=value hash, includes also requested but non-existing settings
      */
     public function getSettings(array $keys): array
     {
         $settings = [];
 
         foreach ($keys as $key) {
             $settings[$key] = null;
         }
 
         $this->settings()->whereIn('key', $keys)->get()
             ->each(function ($setting) use (&$settings) {
                 $settings[$setting->key] = $setting->value;
             });
 
         return $settings;
     }
 
     /**
      * Remove a setting.
      *
      * Example Usage:
      *
      * ```php
      * $user = User::firstOrCreate(['email' => 'some@other.erg']);
      * $user->removeSetting('locale');
      * ```
      *
      * @param string $key Setting name
      *
      * @return void
      */
     public function removeSetting(string $key): void
     {
         $this->setSetting($key, null);
     }
 
     /**
      * Create or update a setting.
      *
      * Example Usage:
      *
      * ```php
      * $user = User::firstOrCreate(['email' => 'some@other.erg']);
      * $user->setSetting('locale', 'en');
      * ```
      *
      * @param string      $key   Setting name
      * @param string|null $value The new value for the setting.
      *
      * @return void
      */
     public function setSetting(string $key, $value): void
     {
         $this->storeSetting($key, $value);
     }
 
     /**
      * Create or update multiple settings in one fell swoop.
      *
      * Example Usage:
      *
      * ```php
      * $user = User::firstOrCreate(['email' => 'some@other.erg']);
-     * $user->setSettings(['locale', 'en', 'country' => 'GB']);
+     * $user->setSettings(['locale' => 'en', 'country' => 'GB']);
      * ```
      *
      * @param array $data An associative array of key value pairs.
      *
      * @return void
      */
     public function setSettings(array $data = []): void
     {
         foreach ($data as $key => $value) {
             $this->storeSetting($key, $value);
         }
     }
 
     /**
      * Create or update a setting.
      *
      * @param string      $key   Setting name
      * @param string|null $value The new value for the setting.
      *
      * @return void
      */
     private function storeSetting(string $key, $value): void
     {
         if ($value === null || $value === '') {
             // Note: We're selecting the record first, so observers can act
             if ($setting = $this->settings()->where('key', $key)->first()) {
                 $setting->delete();
             }
         } else {
             $this->settings()->updateOrCreate(
                 ['key' => $key],
                 ['value' => $value]
             );
         }
     }
 }
diff --git a/src/app/Traits/UserConfigTrait.php b/src/app/Traits/UserConfigTrait.php
index 951488c0..880acf84 100644
--- a/src/app/Traits/UserConfigTrait.php
+++ b/src/app/Traits/UserConfigTrait.php
@@ -1,42 +1,42 @@
 <?php
 
 namespace App\Traits;
 
 trait UserConfigTrait
 {
     /**
      * A helper to get the user configuration.
      */
     public function getConfig(): array
     {
         $config = [];
 
         // TODO: Should we store the default value somewhere in config?
 
-        $config['greylisting'] = $this->getSetting('greylisting') !== 'false';
+        $config['greylist_enabled'] = $this->getSetting('greylist_enabled') !== 'false';
 
         return $config;
     }
 
     /**
      * A helper to update user configuration.
      *
      * @param array $config An array of configuration options
      *
      * @return array A list of input validation error messages
      */
     public function setConfig(array $config): array
     {
         $errors = [];
 
         foreach ($config as $key => $value) {
-            if ($key == 'greylisting') {
-                $this->setSetting('greylisting', $value ? 'true' : 'false');
+            if ($key == 'greylist_enabled') {
+                $this->setSetting('greylist_enabled', $value ? 'true' : 'false');
             } else {
                 $errors[$key] = \trans('validation.invalid-config-parameter');
             }
         }
 
         return $errors;
     }
 }