diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 36b4bacf258..559183de2b2 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -122,7 +122,7 @@ class SiteSetting < ActiveRecord::Base setting(:github_client_id, '') setting(:github_client_secret, '') - client_setting(:enable_persona_logins, true) + client_setting(:enable_persona_logins, false) setting(:enforce_global_nicknames, true) setting(:discourse_org_access_key, '') diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 4bd3c695483..7c1c75caf06 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -252,7 +252,7 @@ en: title: "Log In with Github" message: "Authenticating with Github (make sure pop up blockers are not enabled)" persona: - title: "Log In with Any Email Address (Mozilla Persona)" + title: "Log In with Mozilla Persona" message: "Authenticating with Persona (make sure pop up blockers are not enabled)" composer: