diff --git a/bazarr/main.py b/bazarr/main.py
index d4f5c91aa..2c21b0b56 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -231,7 +231,7 @@ def wizard():
     db = sqlite3.connect(os.path.join(config_dir, 'db', 'bazarr.db'), timeout=30)
     c = db.cursor()
     settings_languages = c.execute("SELECT * FROM table_settings_languages ORDER BY name").fetchall()
-    settings_providers = c.execute("SELECT * FROM table_settings_providers ORDER BY name").fetchall()
+    settings_providers = sorted(provider_manager.names())
     c.close()
     
     return template('wizard', bazarr_version=bazarr_version, settings=settings,
diff --git a/views/wizard.tpl b/views/wizard.tpl
index 4ef9c157f..7f13b07b8 100644
--- a/views/wizard.tpl
+++ b/views/wizard.tpl
@@ -348,7 +348,7 @@
                                         <option value="">Providers</option>
                                         %enabled_providers = []
                                         %for provider in settings_providers:
-                                        <option value="{{provider[0]}}">{{provider[0]}}</option>
+                                        <option value="{{provider}}">{{provider}}</option>
                                         %if provider[1] == True:
                                         %	enabled_providers.append(str(provider[0]))
                                         %end