2 files changed, 7 insertions, 3 deletions

diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index da19613d8..0d511b2c4 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -576,6 +576,10 @@ def import_roster(mlist, config_dict, members, role, action=None):
                 # option to know which action should be taken.
                 action = member_moderation_action_mapping(
                     config_dict.get("member_moderation_action"))
+            else:
+                # Member is not moderated: defer is the best option, as
+                # discussed on merge request 100.
+                action = Action.defer
         if action is not None:
             # Either this was set right above or in the function's arguments
             # for nonmembers.
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 83161bf1f..f55debde5 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -1112,10 +1112,10 @@ class TestPreferencesImport(unittest.TestCase):
         self._do_test(128, dict(moderation_action=Action.discard))
 
     def test_no_moderate(self):
-        # If option flag Moderate is not set, action is None (fallback to the
-        # mailing list's action).
+        # If option flag Moderate is not set, action is defer.
+        # See: https://gitlab.com/mailman/mailman/merge_requests/100
         self._pckdict['member_moderation_action'] = 1          # reject
-        self._do_test(0, dict(moderation_action=None))
+        self._do_test(0, dict(moderation_action=Action.defer))
 
     def test_multiple_options(self):
         # DontReceiveDuplicates & DisableMime & SuppressPasswordReminder