diff --git a/mpf/modes/match/code/match.py b/mpf/modes/match/code/match.py
index f28e0aece..4aea6d5da 100644
--- a/mpf/modes/match/code/match.py
+++ b/mpf/modes/match/code/match.py
@@ -20,7 +20,7 @@ def __init__(self, *args, **kwargs):
         # add setting
         self.machine.settings.add_setting(SettingEntry("match_percentage", "Match Percentage", 500,
                                                        "match_percentage", 10,
-                                                       {0: "Disabled", 2: "2%", 5: "5%", 10: "10%", 15: "15%", 30: "30%",
+                                                       {0: "Never", 2: "2%", 5: "5%", 10: "10%", 15: "15%", 30: "30%",
                                                         50: "50%"}, "standard"))
 
     def _get_match_numbers(self):
@@ -53,8 +53,6 @@ async def _run(self) -> None:
             return
 
         match_percentage = self.machine.settings.get_setting_value("match_percentage")
-        if not match_percentage:
-            return
 
         match_numbers = self._get_match_numbers()
         winner_number = self._get_winner_number(match_numbers, match_percentage)
diff --git a/mpf/plugins/auditor.py b/mpf/plugins/auditor.py
index c6fb57068..f08bb6401 100644
--- a/mpf/plugins/auditor.py
+++ b/mpf/plugins/auditor.py
@@ -71,8 +71,10 @@ def _load_defaults(self):
             self.current_audits['missing_switches'] = dict()
 
         # build the list of switches we should audit
-        self.switchnames_to_audit = {x.name for x in self.machine.switches.values()
-                                     if 'no_audit' not in x.tags}
+        is_free_play = self.machine.settings.get_setting_value('free_play')
+        self.switchnames_to_audit = {x.name for x in self.machine.switches.values() if
+            # Don't audit tagged switches, or credit switches during free play
+            ('no_audit' not in x.tags) and ('no_audit_free' not in x.tags or not is_free_play)}
 
         # Make sure we have all the switches in our audit dict
         for switch_name in self.switchnames_to_audit: