diff --git a/internal/registry/loginrequest/rest.go b/internal/registry/loginrequest/rest.go
index fa5b95a10..c4bc4ed9f 100644
--- a/internal/registry/loginrequest/rest.go
+++ b/internal/registry/loginrequest/rest.go
@@ -127,8 +127,8 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 
 	certPEM, keyPEM, err := r.issuer.IssuePEM(
 		pkix.Name{
-			CommonName:         authResponse.User.GetName(),
-			OrganizationalUnit: authResponse.User.GetGroups(),
+			CommonName:   authResponse.User.GetName(),
+			Organization: authResponse.User.GetGroups(),
 		},
 		[]string{},
 		clientCertificateTTL,
diff --git a/internal/registry/loginrequest/rest_test.go b/internal/registry/loginrequest/rest_test.go
index add537bea..0d89152b5 100644
--- a/internal/registry/loginrequest/rest_test.go
+++ b/internal/registry/loginrequest/rest_test.go
@@ -141,8 +141,8 @@ func TestCreateSucceedsWhenGivenATokenAndTheWebhookAuthenticatesTheToken(t *test
 	issuer := mockcertissuer.NewMockCertIssuer(ctrl)
 	issuer.EXPECT().IssuePEM(
 		pkix.Name{
-			CommonName:         "test-user",
-			OrganizationalUnit: []string{"test-group-1", "test-group-2"}},
+			CommonName:   "test-user",
+			Organization: []string{"test-group-1", "test-group-2"}},
 		[]string{},
 		1*time.Hour,
 	).Return([]byte("test-cert"), []byte("test-key"), nil)