diff --git a/lib/openid_connect_authenticator.rb b/lib/openid_connect_authenticator.rb
index 9ebf4f1..0c16bb2 100644
--- a/lib/openid_connect_authenticator.rb
+++ b/lib/openid_connect_authenticator.rb
@@ -16,6 +16,12 @@ class OpenIDConnectAuthenticator < Auth::ManagedAuthenticator
     SiteSetting.openid_connect_enabled
   end
 
+  def primary_email_verified?(auth)
+    supplied_verified_boolean = auth['extra']['raw_info']['email_verified']
+    # If the payload includes the email_verified boolean, use it. Otherwise assume true
+    supplied_verified_boolean.nil? ? true : supplied_verified_boolean
+  end
+
   def register_middleware(omniauth)
 
     omniauth.provider :openid_connect,
diff --git a/spec/lib/openid_connect_authenticator_spec.rb b/spec/lib/openid_connect_authenticator_spec.rb
new file mode 100644
index 0000000..238af27
--- /dev/null
+++ b/spec/lib/openid_connect_authenticator_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require_relative '../../lib/omniauth_open_id_connect'
+
+describe OpenIDConnectAuthenticator do
+  let(:authenticator) { described_class.new }
+  let(:user) { Fabricate(:user) }
+  let(:hash) { OmniAuth::AuthHash.new(
+    provider: "oidc",
+    uid: "123456789",
+    info: {
+        name: "John Doe",
+        email: user.email
+    },
+    extra: {
+      raw_info: {
+        email: user.email,
+        name: "John Doe"
+      }
+    }
+  )}
+
+  context "when email_verified is not supplied" do
+    # Some IDPs do not supply this information
+    # In this case we trust that they have verified the address
+    it 'matches the user' do
+      result = authenticator.after_authenticate(hash)
+
+      expect(result.user).to eq(user)
+    end
+  end
+
+  context "when email_verified is true" do
+    it 'matches the user' do
+      hash[:extra][:raw_info][:email_verified] = true
+      result = authenticator.after_authenticate(hash)
+      expect(result.user).to eq(user)
+    end
+  end
+
+  context "when email_verified is false" do
+    it 'does not match the user' do
+      hash[:extra][:raw_info][:email_verified] = false
+      result = authenticator.after_authenticate(hash)
+      expect(result.user).to eq(nil)
+    end
+  end
+
+end