diff --git a/www/lib/versandarten/go.php b/www/lib/versandarten/go.php
index 53ba826f..f73e770b 100644
--- a/www/lib/versandarten/go.php
+++ b/www/lib/versandarten/go.php
@@ -61,6 +61,7 @@ class Versandart_go extends Versanddienstleister
         'consignorEmail' => ['typ' => 'text', 'bezeichnung' => 'Absender Email:'],
         'defaultPickupFrom' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit von:'],
         'defaultPickupTill' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit bis:'],
+        'defaultContent' => ['typ' => 'text', 'bezeichnung' => 'Standard Inhalt:']
     ];
   }
 
@@ -73,6 +74,7 @@ class Versandart_go extends Versanddienstleister
     $order->shipment->orderStatus = $this->settings->orderAsDraft ? OrderStatus::New : OrderStatus::Released;
     $order->shipment->SetService($json->product);
     $order->shipment->customerReference = $json->order_number;
+    $order->shipment->content = $this->settings->defaultContent ?? '';
     $order->shipment->weight = floatval($json->weight);
     $order->shipment->pickup->dateFrom = new DateTime($this->settings->defaultPickupFrom);
     if ($order->shipment->pickup->dateFrom < new DateTime('now'))
@@ -124,7 +126,7 @@ class Versandart_go extends Versanddienstleister
     if ($result instanceof CreateOrderResponse) {
       $ret->Success = true;
       $ret->TrackingNumber = $result->hwbNumber;
-      $ret->TrackingUrl = '';
+      $ret->TrackingUrl =  'https://www.general-overnight.com/deu_de/versenden/sendungsverfolgung.html?reference='.$result->hwbNumber;
       $ret->Label = base64_decode($result->hwbOrPackageLabel);
     } else {
       $ret->Errors[] = $result;