diff --git a/forge.go b/forge.go
index 89feb463f2b775181eabbb934a22269ad422f23a..675a006e456380aa0a5427058c46fa9161674b10 100644
--- a/forge.go
+++ b/forge.go
@@ -87,20 +87,9 @@ 		slog.Error("could not get user info", slog.Any("err", err))
 		return nil, redirectURL, err
 	}
 
-	var extraClaims struct {
-		Picture  string `json:"picture"`
-		Username string `json:"preferred_username"`
-	}
-	userInfo.Claims(&extraClaims)
-
-	picture := extraClaims.Picture
-	if picture == "" {
-		picture = fmt.Sprintf("https://www.libravatar.org/avatar/%x", md5.Sum([]byte(userInfo.Email)))
-	}
-
-	login := extraClaims.Username
+	login := userInfo.Profile
 	if login == "" {
-		login = userInfo.Profile
+		login = userInfo.Email
 	}
 
 	return &model.User{
@@ -110,7 +99,7 @@ 		Expiry:        oauthToken.Expiry.Unix(),
 		Login:         login,
 		Email:         userInfo.Email,
 		ForgeRemoteID: model.ForgeRemoteID("gitpecker"),
-		Avatar:        picture,
+		Avatar:        fmt.Sprintf("https://www.libravatar.org/avatar/%x", md5.Sum([]byte(userInfo.Email))),
 	}, redirectURL, nil
 }
 
@@ -129,14 +118,9 @@ 		slog.Error("could not get user info", slog.Any("err", err))
 		return "", err
 	}
 
-	var extraClaims struct {
-		Username string `json:"preferred_username"`
-	}
-	userInfo.Claims(&extraClaims)
-
-	login := extraClaims.Username
+	login := userInfo.Profile
 	if login == "" {
-		login = userInfo.Profile
+		login = userInfo.Email
 	}
 
 	return login, nil