diff --git a/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensAD.ps1 b/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensAD.ps1
index 8d8f64c7..35935b97 100644
--- a/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensAD.ps1
+++ b/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensAD.ps1
@@ -15,7 +15,10 @@ param(
     [string]$ADUsername,
     
     [Parameter(Mandatory=$false)]
-    [string]$DomainController
+    [string]$DomainController,
+    
+    [Parameter(Mandatory=$false)]
+    [string]$EnrollmentTokenExpirationTime
 )
 
 # Function to make authenticated API calls to Defguard
@@ -193,6 +196,11 @@ foreach ($username in $usernames) {
         send_enrollment_notification = $false
     }
     
+    # Add token expiration time if provided
+    if ($EnrollmentTokenExpirationTime) {
+        $requestBody["token_expiration_time"] = $EnrollmentTokenExpirationTime
+    }
+    
     $enrollmentResponse = Invoke-AuthenticatedRestMethod -Method "POST" -Endpoint $enrollmentEndpoint -Body $requestBody
     
     if ($enrollmentResponse) {
diff --git a/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensEntraID.ps1 b/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensEntraID.ps1
index dfb00399..a40ef6bf 100644
--- a/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensEntraID.ps1
+++ b/src-tauri/resources-windows/admin-scripts/GenerateEnrollmentTokensEntraID.ps1
@@ -9,7 +9,10 @@ param(
     [string]$GroupName,
     
     [Parameter(Mandatory=$false)]
-    [string]$AttributeSetName = "Defguard"
+    [string]$AttributeSetName = "Defguard",
+    
+    [Parameter(Mandatory=$false)]
+    [string]$EnrollmentTokenExpirationTime
 )
 
 # Function to make authenticated API calls to Defguard
@@ -281,6 +284,11 @@ foreach ($username in $usernames) {
         send_enrollment_notification = $false
     }
     
+    # Add token expiration time if provided
+    if ($EnrollmentTokenExpirationTime) {
+        $requestBody["token_expiration_time"] = $EnrollmentTokenExpirationTime
+    }
+    
     $enrollmentResponse = Invoke-AuthenticatedRestMethod -Method "POST" -Endpoint $enrollmentEndpoint -Body $requestBody
     
     if ($enrollmentResponse) {