diff --git a/src/actions/dm/dm.service.ts b/src/actions/dm/dm.service.ts
index 347bb5e..49e72f1 100644
--- a/src/actions/dm/dm.service.ts
+++ b/src/actions/dm/dm.service.ts
@@ -36,24 +36,29 @@ export class DmService {
     }
 
     async forward(message: OmitPartialGroupDMChannel<Message<boolean>>) {
-        console.log("forward message");
+        if (message.channel.isDMBased()) {
+            const author = message.author.id;
+            const recipient = message.channel.recipient?.id;
+            console.log("forward message");
+            let context = "";
 
-        const context = `<@${message.author.id}> hat geschrieben: " ${message.content} "`;
-
-        console.log(context);
-
-        try {
-            const channels = client.channels;
-            const channel = channels.cache.get(config.discord.channelIdNotification);
-
-            if (channel?.isTextBased() && channel?.isSendable()) {
-                await channel.send(context);
+            if (message.author.bot) {
+                context = `<@${author}> hat an <@${recipient}> geschrieben:\n"${message.content}"`;
+            }
+            else {
+                context = `<@${author}> hat geschrieben:\n"${message.content}"`;
             }
-        } catch (error) {
-            console.error("error while forwarding a welcome msg:", error);
-        }
 
-        //client.users.send(config.discord.myId, context);
+            try {
+                const channels = client.channels;
+                const channel = channels.cache.get(config.discord.channelIdNotification);
+                if (channel?.isTextBased() && channel?.isSendable()) {
+                    await channel.send(context);
+                }
+            } catch (error) {
+                console.error("error while forwarding a msg:", error);
+            }
+        }
     }
 
     async acceptDm(member: GuildMember) {
diff --git a/src/actions/greeting/greeting.service.ts b/src/actions/greeting/greeting.service.ts
index e039a87..d4055b0 100644
--- a/src/actions/greeting/greeting.service.ts
+++ b/src/actions/greeting/greeting.service.ts
@@ -247,11 +247,14 @@ export class GreetingService {
 
 			try {
 				const channels = client.channels;
-				const channel = channels.cache.get(config.discord.channelIdWelcome);
+				const channel = channels.cache.get(config.discord.channelIdBot);
 
 				if (channel?.isTextBased() && channel?.isSendable()) {
 					await channel.send(welcomeContent);
 				}
+
+				await this.dmService.welcomePrivate(member);
+
 			} catch (error) {
 				console.error("error while sending a welcome command msg:", error);
 			}
diff --git a/src/controllers/discord.controller.ts b/src/controllers/discord.controller.ts
index 29ba16e..75f0c5c 100644
--- a/src/controllers/discord.controller.ts
+++ b/src/controllers/discord.controller.ts
@@ -54,7 +54,6 @@ export default class DiscordController extends EventEmitter {
 		client.on("messageCreate", async (message) => {
 			console.log(message.id)
 			if (message.channel.type === ChannelType.DM
-				&& message.author.id !== config.discord.botId
 			) {
 				console.log("got msg");
 				this.dmService.forward(message);