diff --git a/pkg/api/oauth2_authentications.go b/pkg/api/oauth2_authentications.go
index d5eef59c..5ade4a73 100644
--- a/pkg/api/oauth2_authentications.go
+++ b/pkg/api/oauth2_authentications.go
@@ -230,6 +230,10 @@ func (a *OAuth2AuthenticationApi) CallbackHandler(c *core.WebContext) (string, *
 			languageCode := ""
 			currencyCode := "USD"
 
+			if nickName == "" {
+				nickName = userName
+			}
+
 			if _, exists := locales.AllLanguages[oauth2UserInfo.LanguageCode]; exists {
 				languageCode = oauth2UserInfo.LanguageCode
 			}