diff --git a/plugins/FeedsUserProcessor.inc b/plugins/FeedsUserProcessor.inc
index e526ca8cd07bb0d897ce66dc3f09d00f2d5b1b22..c0b0605daee0a8a353c177ae13429387c6600e36 100644
--- a/plugins/FeedsUserProcessor.inc
+++ b/plugins/FeedsUserProcessor.inc
@@ -100,7 +100,7 @@ class FeedsUserProcessor extends FeedsProcessor {
     // Prepare term object.
     $target_account = new stdClass();
     $target_account->uid = 0;
-    $target_account->roles = $this->config['roles'];
+    $target_account->roles = array_filter($this->config['roles']);
     $target_account->status = $this->config['status'];
 
     // Have parent class do the iterating.
diff --git a/tests/feeds.test b/tests/feeds.test
index 7ebe943f0162558c65f448904150a9267b6e39aa..ca567243ee3609b751dfe2289b4062ecb78e7a3b 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -612,10 +612,9 @@ class FeedsCSVtoUsersTest extends FeedsWebTestCase {
     );
     $this->addMappings('user_import', $mappings);
 
-    // Change some of the basic configuration.
+    // Use standalone form.
     $edit = array(
       'content_type' => '',
-      'import_period' => FEEDS_SCHEDULE_NEVER,
     );
     $this->drupalPost('admin/build/feeds/edit/user_import/settings', $edit, 'Save');