diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml
index 4020fc20..b0092813 100644
--- a/pbs-api-types/Cargo.toml
+++ b/pbs-api-types/Cargo.toml
@@ -14,6 +14,7 @@ regex.workspace = true
 serde.workspace = true
 serde_plain.workspace = true
 
+proxmox-auth-api = { workspace = true, features = [ "api-types" ] }
 proxmox-lang.workspace=true
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 proxmox-serde.workspace = true
diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs
index 0479b637..ec8b1f34 100644
--- a/pbs-api-types/src/lib.rs
+++ b/pbs-api-types/src/lib.rs
@@ -2,6 +2,8 @@
 
 use serde::{Deserialize, Serialize};
 
+use proxmox_auth_api::{APITOKEN_ID_REGEX_STR, USER_ID_REGEX_STR};
+
 pub mod common_regex;
 pub mod percent_encoding;
 
@@ -85,14 +87,14 @@ pub use maintenance::*;
 mod network;
 pub use network::*;
 
-#[macro_use]
-mod userid;
-pub use userid::Authid;
-pub use userid::Userid;
-pub use userid::{Realm, RealmRef};
-pub use userid::{Tokenname, TokennameRef};
-pub use userid::{Username, UsernameRef};
-pub use userid::{PROXMOX_GROUP_ID_SCHEMA, PROXMOX_TOKEN_ID_SCHEMA, PROXMOX_TOKEN_NAME_SCHEMA};
+pub use proxmox_auth_api::types as userid;
+pub use proxmox_auth_api::types::{Authid, Userid};
+pub use proxmox_auth_api::types::{Realm, RealmRef};
+pub use proxmox_auth_api::types::{Tokenname, TokennameRef};
+pub use proxmox_auth_api::types::{Username, UsernameRef};
+pub use proxmox_auth_api::types::{
+    PROXMOX_GROUP_ID_SCHEMA, PROXMOX_TOKEN_ID_SCHEMA, PROXMOX_TOKEN_NAME_SCHEMA,
+};
 
 #[macro_use]
 mod user;