diff --git a/netbox/netbox/preferences.py b/netbox/netbox/preferences.py
index 5ef216259..69ae87f5c 100644
--- a/netbox/netbox/preferences.py
+++ b/netbox/netbox/preferences.py
@@ -18,8 +18,9 @@ PREFERENCES = {
         choices=(
             ('light', 'Light'),
             ('dark', 'Dark'),
+            ('system', 'System')
         ),
-        default='light',
+        default='system',
     ),
     'pagination.per_page': UserPreference(
         label=_('Page length'),
@@ -45,6 +46,7 @@ PREFERENCES = {
             ('json', 'JSON'),
             ('yaml', 'YAML'),
         ),
+        default='json',
     ),
 
 }