diff --git a/src/Form/FormFormBase.php b/src/Form/FormFormBase.php
index 8c134bf..9eab313 100644
--- a/src/Form/FormFormBase.php
+++ b/src/Form/FormFormBase.php
@@ -87,6 +87,10 @@ class FormFormBase extends EntityForm {
       $input['checks'] = $entity->getChecks();
       $input['enabled_fields'] = $enabled_fields;
       $form_state->setUserInput($input);
+    } else {
+      foreach ($entity->enabled_fields as $value) {
+        $enabled_fields[] = rawurldecode($value);
+      }
     }
 
     // Build the form.
@@ -172,7 +176,7 @@ class FormFormBase extends EntityForm {
         'spam' => t('Spam'),
         'profanity' => t('Profanity'),
       ),
-      '#default_value' => array('spam'), //$entity->getChecks(),
+      '#default_value' => $entity->getChecks(),
       '#states' => array(
         'visible' => array(
           '[name="mode"]' => array('value' => (string) FormInterface::MOLLOM_MODE_ANALYSIS),