diff --git a/src/services/chirpstack/chirpstack-gateway.service.ts b/src/services/chirpstack/chirpstack-gateway.service.ts
index c608e9a2..84a721e6 100644
--- a/src/services/chirpstack/chirpstack-gateway.service.ts
+++ b/src/services/chirpstack/chirpstack-gateway.service.ts
@@ -678,7 +678,7 @@ export class ChirpstackGatewayService extends GenericChirpstackConfigurationServ
                <p>Gateway’en ${gateway.name} er kommet online igen ${gateway.lastSeenAt.toLocaleString("da-DK", {
         timeZone: "Europe/Copenhagen",
       })}.</p>
-               <p>Der udsendes først besked igen, når gateway’en kommer online.</p>
+               <p>Der udsendes besked igen, hvis gateway’en går offline i det angivne tidsrum.</p>
                <p>Link: <a href="${this.configService.get<string>("frontend.baseurl")}/gateways/gateway-detail/${
         gateway.gatewayId
       }">${this.configService.get<string>("frontend.baseurl")}/gateways/gateway-detail/${gateway.gatewayId}</a></p>`,
diff --git a/src/services/data-targets/data-target.service.ts b/src/services/data-targets/data-target.service.ts
index 3db6aa84..92c61d62 100644
--- a/src/services/data-targets/data-target.service.ts
+++ b/src/services/data-targets/data-target.service.ts
@@ -90,6 +90,14 @@ export class DataTargetService {
     });
   }
 
+  async findOneWithClientSecret(id: number): Promise<DataTarget> {
+    return await this.dataTargetRepository
+      .createQueryBuilder("dt")
+      .addSelect("dt.clientSecret")
+      .where('dt."id" = :id', { id: id })
+      .getOne();
+  }
+
   public async findOneWithHasRecentError(id: number): Promise<DataTargetDto> {
     const datatarget = await this.findOne(id);
     const idsWithRecentError = await this.dataTargetLogService.getDatatargetWithRecentError([id]);
@@ -245,6 +253,10 @@ export class DataTargetService {
       iotDeviceId: testDto.iotDeviceId,
     };
 
+    if (dataTarget.type === DataTargetType.Fiware) {
+      const fiwareDatatarget = await this.findOneWithClientSecret(testDto.dataTargetId);
+      (dataTarget as FiwareDataTarget).clientSecret = (fiwareDatatarget as FiwareDataTarget).clientSecret;
+    }
     const result = await this.dataTargetSenderService.sendToDataTarget(dataTarget, payloadDto);
     return {
       result,