diff --git a/go/svc/auth/v1/service.pb.go b/go/svc/auth/v1/service.pb.go
index 45d681d..4740425 100644
--- a/go/svc/auth/v1/service.pb.go
+++ b/go/svc/auth/v1/service.pb.go
@@ -229,9 +229,13 @@ func (x *GetAuthURLResponse) GetAuthUrl() string {
 }
 
 type BeginDeviceAuthRequest struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Organization  string                 `protobuf:"bytes,1,opt,name=organization,proto3" json:"organization,omitempty"`
-	ReturnToUrl   string                 `protobuf:"bytes,2,opt,name=return_to_url,json=returnToUrl,proto3" json:"return_to_url,omitempty"`
+	state protoimpl.MessageState `protogen:"open.v1"`
+	// Types that are valid to be assigned to Organization:
+	//
+	//	*BeginDeviceAuthRequest_ById
+	//	*BeginDeviceAuthRequest_ByName
+	Organization  isBeginDeviceAuthRequest_Organization `protobuf_oneof:"organization"`
+	ReturnToUrl   string                                `protobuf:"bytes,2,opt,name=return_to_url,json=returnToUrl,proto3" json:"return_to_url,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -266,10 +270,28 @@ func (*BeginDeviceAuthRequest) Descriptor() ([]byte, []int) {
 	return file_svc_auth_v1_service_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *BeginDeviceAuthRequest) GetOrganization() string {
+func (x *BeginDeviceAuthRequest) GetOrganization() isBeginDeviceAuthRequest_Organization {
 	if x != nil {
 		return x.Organization
 	}
+	return nil
+}
+
+func (x *BeginDeviceAuthRequest) GetById() int64 {
+	if x != nil {
+		if x, ok := x.Organization.(*BeginDeviceAuthRequest_ById); ok {
+			return x.ById
+		}
+	}
+	return 0
+}
+
+func (x *BeginDeviceAuthRequest) GetByName() string {
+	if x != nil {
+		if x, ok := x.Organization.(*BeginDeviceAuthRequest_ByName); ok {
+			return x.ByName
+		}
+	}
 	return ""
 }
 
@@ -280,6 +302,22 @@ func (x *BeginDeviceAuthRequest) GetReturnToUrl() string {
 	return ""
 }
 
+type isBeginDeviceAuthRequest_Organization interface {
+	isBeginDeviceAuthRequest_Organization()
+}
+
+type BeginDeviceAuthRequest_ById struct {
+	ById int64 `protobuf:"varint,100,opt,name=by_id,json=byId,proto3,oneof"`
+}
+
+type BeginDeviceAuthRequest_ByName struct {
+	ByName string `protobuf:"bytes,101,opt,name=by_name,json=byName,proto3,oneof"`
+}
+
+func (*BeginDeviceAuthRequest_ById) isBeginDeviceAuthRequest_Organization() {}
+
+func (*BeginDeviceAuthRequest_ByName) isBeginDeviceAuthRequest_Organization() {}
+
 type BeginDeviceAuthResponse struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	Url   string                 `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
@@ -487,10 +525,12 @@ const file_svc_auth_v1_service_proto_rawDesc = "" +
 	"\x10operating_system\x18\x02 \x01(\tR\x0foperatingSystem\x126\n" +
 	"\rusing_version\x18\x03 \x01(\v2\x11.types.v1.VersionR\fusingVersion\"/\n" +
 	"\x12GetAuthURLResponse\x12\x19\n" +
-	"\bauth_url\x18\x01 \x01(\tR\aauthUrl\"`\n" +
-	"\x16BeginDeviceAuthRequest\x12\"\n" +
-	"\forganization\x18\x01 \x01(\tR\forganization\x12\"\n" +
-	"\rreturn_to_url\x18\x02 \x01(\tR\vreturnToUrl\"\xe4\x01\n" +
+	"\bauth_url\x18\x01 \x01(\tR\aauthUrl\"~\n" +
+	"\x16BeginDeviceAuthRequest\x12\x15\n" +
+	"\x05by_id\x18d \x01(\x03H\x00R\x04byId\x12\x19\n" +
+	"\aby_name\x18e \x01(\tH\x00R\x06byName\x12\"\n" +
+	"\rreturn_to_url\x18\x02 \x01(\tR\vreturnToUrlB\x0e\n" +
+	"\forganization\"\xe4\x01\n" +
 	"\x17BeginDeviceAuthResponse\x12\x10\n" +
 	"\x03url\x18\x01 \x01(\tR\x03url\x12\x1f\n" +
 	"\vdevice_code\x18\x02 \x01(\tR\n" +
@@ -568,6 +608,10 @@ func file_svc_auth_v1_service_proto_init() {
 		(*GetAuthURLRequest_ById)(nil),
 		(*GetAuthURLRequest_ByName)(nil),
 	}
+	file_svc_auth_v1_service_proto_msgTypes[3].OneofWrappers = []any{
+		(*BeginDeviceAuthRequest_ById)(nil),
+		(*BeginDeviceAuthRequest_ByName)(nil),
+	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/js/svc/auth/v1/service_pb.ts b/js/svc/auth/v1/service_pb.ts
index 92dc78d..a437f17 100644
--- a/js/svc/auth/v1/service_pb.ts
+++ b/js/svc/auth/v1/service_pb.ts
@@ -18,7 +18,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file svc/auth/v1/service.proto.
  */
 export const file_svc_auth_v1_service: GenFile = /*@__PURE__*/
-  fileDesc("ChlzdmMvYXV0aC92MS9zZXJ2aWNlLnByb3RvEgtzdmMuYXV0aC52MSKTAQoRR2V0QXV0aFVSTFJlcXVlc3QSDwoFYnlfaWQYZCABKANIABIRCgdieV9uYW1lGGUgASgJSAASFQoNcmV0dXJuX3RvX3VybBgCIAEoCRIzCglsb2NhbGhvc3QYAyABKAsyIC5zdmMuYXV0aC52MS5Mb2NhbGhvc3RWaWFCcm93c2VyQg4KDG9yZ2FuaXphdGlvbiJvChNMb2NhbGhvc3RWaWFCcm93c2VyEhQKDGFyY2hpdGVjdHVyZRgBIAEoCRIYChBvcGVyYXRpbmdfc3lzdGVtGAIgASgJEigKDXVzaW5nX3ZlcnNpb24YAyABKAsyES50eXBlcy52MS5WZXJzaW9uIiYKEkdldEF1dGhVUkxSZXNwb25zZRIQCghhdXRoX3VybBgBIAEoCSJFChZCZWdpbkRldmljZUF1dGhSZXF1ZXN0EhQKDG9yZ2FuaXphdGlvbhgBIAEoCRIVCg1yZXR1cm5fdG9fdXJsGAIgASgJIrABChdCZWdpbkRldmljZUF1dGhSZXNwb25zZRILCgN1cmwYASABKAkSEwoLZGV2aWNlX2NvZGUYAiABKAkSEQoJdXNlcl9jb2RlGAMgASgJEi4KCmV4cGlyZXNfYXQYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjAKDXBvbGxfaW50ZXJ2YWwYBSABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24icwoZQ29tcGxldGVEZXZpY2VBdXRoUmVxdWVzdBITCgtkZXZpY2VfY29kZRgBIAEoCRIRCgl1c2VyX2NvZGUYAiABKAkSFAoMYXJjaGl0ZWN0dXJlGAUgASgJEhgKEG9wZXJhdGluZ19zeXN0ZW0YBiABKAkiQAoaQ29tcGxldGVEZXZpY2VBdXRoUmVzcG9uc2USIgoFdG9rZW4YASABKAsyEy50eXBlcy52MS5Vc2VyVG9rZW4ypwIKC0F1dGhTZXJ2aWNlEk8KCkdldEF1dGhVUkwSHi5zdmMuYXV0aC52MS5HZXRBdXRoVVJMUmVxdWVzdBofLnN2Yy5hdXRoLnYxLkdldEF1dGhVUkxSZXNwb25zZSIAEl4KD0JlZ2luRGV2aWNlQXV0aBIjLnN2Yy5hdXRoLnYxLkJlZ2luRGV2aWNlQXV0aFJlcXVlc3QaJC5zdmMuYXV0aC52MS5CZWdpbkRldmljZUF1dGhSZXNwb25zZSIAEmcKEkNvbXBsZXRlRGV2aWNlQXV0aBImLnN2Yy5hdXRoLnYxLkNvbXBsZXRlRGV2aWNlQXV0aFJlcXVlc3QaJy5zdmMuYXV0aC52MS5Db21wbGV0ZURldmljZUF1dGhSZXNwb25zZSIAQp4BCg9jb20uc3ZjLmF1dGgudjFCDFNlcnZpY2VQcm90b1ABWi9naXRodWIuY29tL2h1bWFubG9naW8vYXBpL2dvL3N2Yy9hdXRoL3YxO2F1dGh2MaICA1NBWKoCC1N2Yy5BdXRoLlYxygILU3ZjXEF1dGhcVjHiAhdTdmNcQXV0aFxWMVxHUEJNZXRhZGF0YeoCDVN2Yzo6QXV0aDo6VjFiBnByb3RvMw", [file_google_protobuf_duration, file_google_protobuf_timestamp, file_types_v1_environment, file_types_v1_meta, file_types_v1_user_token, file_types_v1_version]);
+  fileDesc("ChlzdmMvYXV0aC92MS9zZXJ2aWNlLnByb3RvEgtzdmMuYXV0aC52MSKTAQoRR2V0QXV0aFVSTFJlcXVlc3QSDwoFYnlfaWQYZCABKANIABIRCgdieV9uYW1lGGUgASgJSAASFQoNcmV0dXJuX3RvX3VybBgCIAEoCRIzCglsb2NhbGhvc3QYAyABKAsyIC5zdmMuYXV0aC52MS5Mb2NhbGhvc3RWaWFCcm93c2VyQg4KDG9yZ2FuaXphdGlvbiJvChNMb2NhbGhvc3RWaWFCcm93c2VyEhQKDGFyY2hpdGVjdHVyZRgBIAEoCRIYChBvcGVyYXRpbmdfc3lzdGVtGAIgASgJEigKDXVzaW5nX3ZlcnNpb24YAyABKAsyES50eXBlcy52MS5WZXJzaW9uIiYKEkdldEF1dGhVUkxSZXNwb25zZRIQCghhdXRoX3VybBgBIAEoCSJjChZCZWdpbkRldmljZUF1dGhSZXF1ZXN0Eg8KBWJ5X2lkGGQgASgDSAASEQoHYnlfbmFtZRhlIAEoCUgAEhUKDXJldHVybl90b191cmwYAiABKAlCDgoMb3JnYW5pemF0aW9uIrABChdCZWdpbkRldmljZUF1dGhSZXNwb25zZRILCgN1cmwYASABKAkSEwoLZGV2aWNlX2NvZGUYAiABKAkSEQoJdXNlcl9jb2RlGAMgASgJEi4KCmV4cGlyZXNfYXQYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjAKDXBvbGxfaW50ZXJ2YWwYBSABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24icwoZQ29tcGxldGVEZXZpY2VBdXRoUmVxdWVzdBITCgtkZXZpY2VfY29kZRgBIAEoCRIRCgl1c2VyX2NvZGUYAiABKAkSFAoMYXJjaGl0ZWN0dXJlGAUgASgJEhgKEG9wZXJhdGluZ19zeXN0ZW0YBiABKAkiQAoaQ29tcGxldGVEZXZpY2VBdXRoUmVzcG9uc2USIgoFdG9rZW4YASABKAsyEy50eXBlcy52MS5Vc2VyVG9rZW4ypwIKC0F1dGhTZXJ2aWNlEk8KCkdldEF1dGhVUkwSHi5zdmMuYXV0aC52MS5HZXRBdXRoVVJMUmVxdWVzdBofLnN2Yy5hdXRoLnYxLkdldEF1dGhVUkxSZXNwb25zZSIAEl4KD0JlZ2luRGV2aWNlQXV0aBIjLnN2Yy5hdXRoLnYxLkJlZ2luRGV2aWNlQXV0aFJlcXVlc3QaJC5zdmMuYXV0aC52MS5CZWdpbkRldmljZUF1dGhSZXNwb25zZSIAEmcKEkNvbXBsZXRlRGV2aWNlQXV0aBImLnN2Yy5hdXRoLnYxLkNvbXBsZXRlRGV2aWNlQXV0aFJlcXVlc3QaJy5zdmMuYXV0aC52MS5Db21wbGV0ZURldmljZUF1dGhSZXNwb25zZSIAQp4BCg9jb20uc3ZjLmF1dGgudjFCDFNlcnZpY2VQcm90b1ABWi9naXRodWIuY29tL2h1bWFubG9naW8vYXBpL2dvL3N2Yy9hdXRoL3YxO2F1dGh2MaICA1NBWKoCC1N2Yy5BdXRoLlYxygILU3ZjXEF1dGhcVjHiAhdTdmNcQXV0aFxWMVxHUEJNZXRhZGF0YeoCDVN2Yzo6QXV0aDo6VjFiBnByb3RvMw", [file_google_protobuf_duration, file_google_protobuf_timestamp, file_types_v1_environment, file_types_v1_meta, file_types_v1_user_token, file_types_v1_version]);
 
 /**
  * @generated from message svc.auth.v1.GetAuthURLRequest
@@ -110,9 +110,21 @@ export const GetAuthURLResponseSchema: GenMessage<GetAuthURLResponse> = /*@__PUR
  */
 export type BeginDeviceAuthRequest = Message<"svc.auth.v1.BeginDeviceAuthRequest"> & {
   /**
-   * @generated from field: string organization = 1;
+   * @generated from oneof svc.auth.v1.BeginDeviceAuthRequest.organization
    */
-  organization: string;
+  organization: {
+    /**
+     * @generated from field: int64 by_id = 100;
+     */
+    value: bigint;
+    case: "byId";
+  } | {
+    /**
+     * @generated from field: string by_name = 101;
+     */
+    value: string;
+    case: "byName";
+  } | { case: undefined; value?: undefined };
 
   /**
    * @generated from field: string return_to_url = 2;
diff --git a/proto/svc/auth/v1/service.proto b/proto/svc/auth/v1/service.proto
index 7d3b73a..ecb6066 100644
--- a/proto/svc/auth/v1/service.proto
+++ b/proto/svc/auth/v1/service.proto
@@ -38,7 +38,10 @@ message GetAuthURLResponse {
 }
 
 message BeginDeviceAuthRequest {
-  string organization = 1;
+  oneof organization {
+    int64 by_id = 100;
+    string by_name = 101;
+  }
   string return_to_url = 2;
 }