diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py
index 072c7e81..5b9a2bb1 100644
--- a/changedetectionio/__init__.py
+++ b/changedetectionio/__init__.py
@@ -571,7 +571,7 @@ def changedetection_app(config=None, datastore_o=None):
                                data=default,
                                )
 
-        form.fetch_backend.choices.append(("default", 'System settings default'))
+        form.fetch_backend.choices.append(("system", 'System settings default'))
 
         # form.browser_steps[0] can be assumed that we 'goto url' first
 
diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py
index 02308212..8ef2112f 100644
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -138,7 +138,7 @@ class ValidateContentFetcherIsReady(object):
         from changedetectionio import content_fetcher
 
         # Better would be a radiohandler that keeps a reference to each class
-        if field.data is not None and field.data != 'None':
+        if field.data is not None and field.data != 'system':
             klass = getattr(content_fetcher, field.data)
             some_object = klass()
             try: