diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index f707c12ccb..de16a2d66d 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -372,15 +372,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
 }
 
 func getUserName(gothUser *goth.User) (string, error) {
-	return gothUser.RawData["preferred_username"]
-	// switch setting.OAuth2Client.Username {
-	// case setting.OAuth2UsernameEmail:
-		// return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
-	// case setting.OAuth2UsernameNickname:
-		// return user_model.NormalizeUserName(gothUser.NickName)
-	// default: // OAuth2UsernameUserid
-		// return gothUser.UserID, nil
-	// }
+	return user_model.NormalizeUserName(gothUser.RawData["preferred_username"].(string))
 }
 
 // HandleSignOut resets the session and sets the cookies