diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go
index 29241dc6..318bcf86 100644
--- a/connector/oidc/oidc.go
+++ b/connector/oidc/oidc.go
@@ -299,10 +299,7 @@ func (c *oidcConnector) createIdentity(ctx context.Context, identity connector.I
 	preferredUsername, found := claims[prefUsername].(string)
 	if (!found || c.overrideClaimMapping) && c.preferredUsernameKey != "" {
 		prefUsername = c.preferredUsernameKey
-		preferredUsername, found = claims[prefUsername].(string)
-		if !found {
-			return identity, fmt.Errorf("missing \"%s\" claim", prefUsername)
-		}
+		preferredUsername, _ = claims[prefUsername].(string)
 	}
 
 	hasEmailScope := false
@@ -319,9 +316,6 @@ func (c *oidcConnector) createIdentity(ctx context.Context, identity connector.I
 	if (!found || c.overrideClaimMapping) && c.emailKey != "" {
 		emailKey = c.emailKey
 		email, found = claims[emailKey].(string)
-		if !found {
-			return identity, fmt.Errorf("missing \"%s\" claim", emailKey)
-		}
 	}
 
 	if !found && hasEmailScope {
diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go
index 9040cf5c..3038cebc 100644
--- a/connector/oidc/oidc_test.go
+++ b/connector/oidc/oidc_test.go
@@ -253,7 +253,7 @@ func TestHandleCallback(t *testing.T) {
 			},
 		},
 		{
-			name:                      "customGroupsKeyButGroupsProvidedButOverride",
+			name:                      "customGroupsKeyDespiteGroupsProvidedButOverride",
 			overrideClaimMapping:      true,
 			groupsKey:                 "cognito:groups",
 			expectUserID:              "subvalue",