diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 8d070589905..bc6ccf62a86 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -111,7 +111,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return Discourse.InputValidation.create({
         ok: true,
         reason: I18n.t('user.email.authenticated', {
-          provider: this.get('authOptions.auth_provider')
+          provider: this.authProviderDisplayName(this.get('authOptions.auth_provider'))
         })
       });
     }
@@ -133,6 +133,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return this.get('authOptions.email') === this.get("accountEmail") && this.get('authOptions.email_valid');
   }.property('accountEmail', 'authOptions.email', 'authOptions.email_valid'),
 
+  authProviderDisplayName(provider) {
+    switch(provider) {
+      case "Google_oauth2": return "Google";
+      default: return provider;
+    }
+  },
+
   prefillUsername: function() {
     if (this.get('prefilledUsername')) {
       // If username field has been filled automatically, and email field just changed,
diff --git a/config/initializers/009-omniauth.rb b/config/initializers/009-omniauth.rb
index 6138ec97781..90feb34426b 100644
--- a/config/initializers/009-omniauth.rb
+++ b/config/initializers/009-omniauth.rb
@@ -3,11 +3,12 @@ require "openid_redis_store"
 
 # if you need to test this and are having ssl issues see:
 #  http://stackoverflow.com/questions/6756460/openssl-error-using-omniauth-specified-ssl-path-but-didnt-work
+# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   Discourse.authenticators.each do |authenticator|
     authenticator.register_middleware(self)
   end
 end
- 
+
 OmniAuth.config.logger = Rails.logger