diff --git a/controllers/account.go b/controllers/account.go
index 1eadae73..f7aed5bc 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -458,6 +458,10 @@ func (c *ApiController) GetAccount() {
 		return
 	}
 
+	if organization != nil && len(organization.CountryCodes) == 1 && u != nil && u.CountryCode == "" {
+		u.CountryCode = organization.CountryCodes[0]
+	}
+
 	accessToken := c.GetSessionToken()
 	if accessToken == "" {
 		accessToken, err = object.GetAccessTokenByUser(user, c.Ctx.Request.Host)