diff --git a/go.mod b/go.mod
index a38991348d..1ee82bd7ff 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/aws/aws-sdk-go v1.34.24 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc
 	github.com/caos/logging v0.0.2
-	github.com/caos/oidc v0.9.0
+	github.com/caos/oidc v0.9.1
 	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
 	github.com/cockroachdb/cockroach-go/v2 v2.0.7
 	github.com/envoyproxy/protoc-gen-validate v0.4.1
diff --git a/go.sum b/go.sum
index e7bce3a100..32bd60435d 100644
--- a/go.sum
+++ b/go.sum
@@ -71,8 +71,8 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/caos/logging v0.0.2 h1:ebg5C/HN0ludYR+WkvnFjwSExF4wvyiWPyWGcKMYsoo=
 github.com/caos/logging v0.0.2/go.mod h1:9LKiDE2ChuGv6CHYif/kiugrfEXu9AwDiFWSreX7Wp0=
-github.com/caos/oidc v0.9.0 h1:de2ASx4VmTsH7viU8kigypFGNk1kh0sPXz7ivzBNl9E=
-github.com/caos/oidc v0.9.0/go.mod h1:RREtWSRzH/mXQXJkxB63mFDZ/RUNyzoU6czd6UJfvJI=
+github.com/caos/oidc v0.9.1 h1:w/QccYOrEe6mkd/I2QKbCGwz8P+jnCpVF3+5FYQWMV4=
+github.com/caos/oidc v0.9.1/go.mod h1:RREtWSRzH/mXQXJkxB63mFDZ/RUNyzoU6czd6UJfvJI=
 github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
diff --git a/internal/api/oidc/client.go b/internal/api/oidc/client.go
index 71b1355327..13131aaf1c 100644
--- a/internal/api/oidc/client.go
+++ b/internal/api/oidc/client.go
@@ -121,11 +121,16 @@ func (o *OPStorage) GetUserinfoFromScopes(ctx context.Context, userID string, sc
 			if user.HumanView == nil {
 				continue
 			}
-			userInfo.Address.StreetAddress = user.StreetAddress
-			userInfo.Address.Locality = user.Locality
-			userInfo.Address.Region = user.Region
-			userInfo.Address.PostalCode = user.PostalCode
-			userInfo.Address.Country = user.Country
+			if user.StreetAddress == "" && user.Locality == "" && user.Region == "" && user.PostalCode == "" && user.Country == "" {
+				continue
+			}
+			userInfo.Address = &oidc.UserinfoAddress{
+				StreetAddress: user.StreetAddress,
+				Locality:      user.Locality,
+				Region:        user.Region,
+				PostalCode:    user.PostalCode,
+				Country:       user.Country,
+			}
 		default:
 			userInfo.Authorizations = append(userInfo.Authorizations, scope)
 		}