diff --git a/scripts/preorder/ofaa-oaid/confirm-single-oaid.php b/scripts/preorder/ofaa-oaid/confirm-single-oaid.php
new file mode 100755
index 000000000..9ce26f09d
--- /dev/null
+++ b/scripts/preorder/ofaa-oaid/confirm-single-oaid.php
@@ -0,0 +1,44 @@
+#!/usr/bin/php
+<?php
+require_once __DIR__."/include/config.php";
+require_once __DIR__."/include/rest.php";
+
+$oaid = false;
+
+if(count($argv) > 1) {
+  $oaid = $argv[1];
+}
+
+if(!$oaid) {
+  die("OAID name required\n");
+}
+
+if(!$access_token) {
+  $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
+  if(!$access_token) {
+    die("Error getting access token");
+  }
+}
+
+$headers = [
+    "Authorization: Bearer $access_token",
+    "Accept: application/json",
+    "Content-type: application/json",
+];
+
+$confirm_url = str_replace("{oaid}", $oaid, $ep_confirm_oaid);
+$out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
+if($output == "__err__401") {
+  $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
+  $headers = [
+    "Authorization: Bearer $access_token",
+    "Accept: application/json",
+    "Content-type: application/json",
+  ];
+  $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
+  $u++;
+}
+
+echo "$oaid_name confirmed.\n";
+
+
diff --git a/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php b/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
index 7ed21bb9f..194e86dc6 100755
--- a/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
+++ b/scripts/preorder/ofaa-oaid/create-and-confirm-oaid.php
@@ -21,12 +21,22 @@ $content = [
   "tenant" => $tenant,
   "version" => "v8",
 ];
-var_dump($content);
+//var_dump($content);
+
+if(count($argv) > 1) {
+  $batch_size = intval($argv[1]);
+}
+
+if(!$batch_size) {
+  die("Batchsize not defined!\n");
+}
 
 $c = 0;
 $u = 0;
 
-for($i = 0; $i < 621; $i++) {
+echo "Creating and confirming $batch_size version ".$content['version']." OAIDs for tenant ".$content['tenant']."\n";
+
+for($i = 0; $i < $batch_size; $i++) {
   $content['external_id'] = guidv4();
   
   $output = postRestUrl($ep_request_oaid, $headers, $content, "application/json");
@@ -61,7 +71,7 @@ for($i = 0; $i < 621; $i++) {
   if($token == "requested") {
     $confirm_url = str_replace("{oaid}", $oaid, $ep_confirm_oaid);
     $out = putRestUrl($confirm_url, $headers, ["token" => "confirmed"], "application/json");
-    if($output == "__err__401") {
+    if($out == "__err__401") {
       $access_token = fetchAccessToken($oauth_url, $client_id, $client_secret, $default_scope);
       $headers = [
         "Authorization: Bearer $access_token",
diff --git a/scripts/preorder/ofaa-oaid/include/.access_token b/scripts/preorder/ofaa-oaid/include/.access_token
deleted file mode 100644
index 92f8e5960..000000000
--- a/scripts/preorder/ofaa-oaid/include/.access_token
+++ /dev/null
@@ -1 +0,0 @@
-eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI5TmkwTWZMaTB4LUlzOEEzc3V1ZlgxNVJiZlROTTRrUDJ2d1lackxvNWRVIn0.eyJleHAiOjE2ODU5Nzk5NTMsImlhdCI6MTY4NTk3OTY1MywianRpIjoiYTFlZTA2ZjUtZTk0Yy00YjE1LTk5ZGQtZjNkNDg5M2M1NDRkIiwiaXNzIjoiaHR0cHM6Ly9zc28ueWlvLmF0L2F1dGgvcmVhbG1zL29haWQiLCJhdWQiOlsiaHR0cHM6Ly9hcGkub2FpZC5hdCIsImFjY291bnQiXSwic3ViIjoiNWI1ZmMyYzktMTcyNi00ZTIxLTkyNGUtYjI5MjdiMGY2MDM3IiwidHlwIjoiQmVhcmVyIiwiYXpwIjoib2FpZC5vZmFhLmVzdGVpZXJtYXJrIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwczovL2FwaS1kZW1vLm9haWQuYXQiLCJodHRwczovL2FwaS5vYWlkLmF0Il0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLW9haWQiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJlbWFpbCBvYWlkOm1nbTpyZWFkIG9haWQ6Y29kZXM6d3JpdGUgb2FpZDpjb2RlczpyZWFkIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImNsaWVudEhvc3QiOiIxNzYuNjYuMTYwLjE1NCIsImNsaWVudElkIjoib2FpZC5vZmFhLmVzdGVpZXJtYXJrIiwicHJlZmVycmVkX3VzZXJuYW1lIjoic2VydmljZS1hY2NvdW50LW9haWQub2ZhYS5lc3RlaWVybWFyayIsImNsaWVudEFkZHJlc3MiOiIxNzYuNjYuMTYwLjE1NCJ9.WvBdzNge8zrNIYemmBhVTk7FtKl-8lMhTGGlVkH5yKGxcEktjZPwsu_Jg_VbxgCtNJxnFqtMaGHz6pXp4Cl1HAXAUDfjXOujalKe9o0FthdI7UVIOn500l7pS0ZnJiidgB48GqBKwkr_qUbdd6aChqhUEBjeSmGQWNTikzZhgI1xv6P8IwURPBC9yQVHN9kCrZuF_xeMFXSbuf_Yej9AWRZeHCz13kIvyTEKnRBu6rt-VfrUSBgbdAZDErOVzqeCVufn_kxViUsxYQeVX8_8vNQydiOrgXED5aTLEG0csThKx4HMPh9KMZWiJ5R797OZMfqve7j5RYjDO0Ez44tv-w
\ No newline at end of file
diff --git a/scripts/preorder/ofaa-oaid/include/.gitignore b/scripts/preorder/ofaa-oaid/include/.gitignore
new file mode 100644
index 000000000..a19c67713
--- /dev/null
+++ b/scripts/preorder/ofaa-oaid/include/.gitignore
@@ -0,0 +1 @@
+.access_token
\ No newline at end of file
diff --git a/scripts/preorder/ofaa-oaid/include/config.php b/scripts/preorder/ofaa-oaid/include/config.php
index d947ff6de..6f6352a3f 100644
--- a/scripts/preorder/ofaa-oaid/include/config.php
+++ b/scripts/preorder/ofaa-oaid/include/config.php
@@ -1,5 +1,9 @@
 <?php
 
+// how many OAIDs to create at once
+// 0 requires command line argument (which always overrides this variable)
+$batch_size = 0;
+
 $oauth_url = "https://sso.yio.at/auth/realms/oaid/protocol/openid-connect/token";
 
 $baseurl = "https://api.oaid.at/v1";
diff --git a/scripts/preorder/ofaa-oaid/list-oaid-csv.php b/scripts/preorder/ofaa-oaid/list-oaid-csv.php
index b834b7631..54b07ea3f 100755
--- a/scripts/preorder/ofaa-oaid/list-oaid-csv.php
+++ b/scripts/preorder/ofaa-oaid/list-oaid-csv.php
@@ -41,6 +41,9 @@ while(1) {
     echo $oaid_obj->oaid.";";
     echo $oaid_obj->external_id.";";
     echo ";";
+    if($oaid_obj->token != "confirmed") {
+      file_put_contents( "php://stderr", "; ".$oaid_obj->token );
+    }
     echo "\n";
   }
   $page++;