diff --git a/API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java b/API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java
index 3ce51ff3..980911a2 100644
--- a/API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java
+++ b/API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java
@@ -473,6 +473,14 @@ public enum Message {
             "&7Website&8: #99E0FF<hover:show_text:'&fOpen the Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>",
             ""
     ),
+    JOIN_MOTD(
+            "",
+            "#99E0FFWelcome back %player%#99E0FF !",
+            "",
+            "#858ef8Discord&8: #99E0FF<hover:show_text:'&fJoin the server #858ef8Discord &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>",
+            "&7Website&8: #99E0FF<hover:show_text:'&fOpen the Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>",
+            ""
+    ),
 
     COMMAND_SET_SPAWN("&fYou just set the spawn location."),
     COMMAND_SPAWN_NOT_DEFINE("<error>The spawn does not exist. Please contact an administrator."),
diff --git a/src/main/java/fr/maxlego08/essentials/module/modules/JoinQuitModule.java b/src/main/java/fr/maxlego08/essentials/module/modules/JoinQuitModule.java
index 01a262b2..f4901667 100644
--- a/src/main/java/fr/maxlego08/essentials/module/modules/JoinQuitModule.java
+++ b/src/main/java/fr/maxlego08/essentials/module/modules/JoinQuitModule.java
@@ -25,6 +25,8 @@ public class JoinQuitModule extends ZModule {
     private boolean allowFirstJoinBroadcast;
     private boolean allowFirstJoinMotd;
     private int firstJoinMotdTicks;
+    private boolean allowJoinMotd;
+    private int joinMotdTicks;
 
     public JoinQuitModule(ZEssentialsPlugin plugin) {
         super(plugin, "join_quit");
@@ -80,6 +82,12 @@ public void onJoin(PlayerJoinEvent event) {
                 message(player, Message.FIRST_JOIN_MOTD, "%player%", player.getName(), "%displayName%", player.getDisplayName());
             }, this.firstJoinMotdTicks);
         }
+
+        if (this.allowJoinMotd) {
+            this.plugin.getScheduler().runAtLocationLater(player.getLocation(), () -> {
+                message(player, Message.JOIN_MOTD, "%player%", player.getName(), "%displayName%", player.getDisplayName());
+            }, this.joinMotdTicks);
+        }
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
diff --git a/src/main/resources/messages/message_zh.yml b/src/main/resources/messages/message_zh.yml
index eeb7acad..f6fd2284 100644
--- a/src/main/resources/messages/message_zh.yml
+++ b/src/main/resources/messages/message_zh.yml
@@ -251,6 +251,14 @@ first-join-motd:
 - '&7网站&8: #99E0FF<hover:show_text:''&f打开网站 &f！''><click:open_url:''https://minecraft-inventory-builder.com/''>https://minecraft-inventory-builder.com/</click></hover>'
 - ''
 
+join-motd:
+- ''
+- '#99E0FF欢迎回来 %player%#99E0FF！'
+- ''
+- '#858ef8Discord&8: #99E0FF<hover:show_text:''&f加入服务器 #858ef8Discord &f！''><click:open_url:''https://discord.groupez.dev/''>https://discord.groupez.dev/</click></hover>'
+- '&7网站&8: #99E0FF<hover:show_text:''&f打开网站 &f！''><click:open_url:''https://minecraft-inventory-builder.com/''>https://minecraft-inventory-builder.com/</click></hover>'
+- ''
+
 # 出生点
 command-set-spawn: '&f您刚刚设置了出生点位置。'
 command-spawn-not-define: <error>出生点不存在。请联系管理员。
diff --git a/src/main/resources/messages/messages.yml b/src/main/resources/messages/messages.yml
index a4668821..970b3d89 100644
--- a/src/main/resources/messages/messages.yml
+++ b/src/main/resources/messages/messages.yml
@@ -256,6 +256,14 @@ first-join-motd:
   - "&7Website&8: #99E0FF<hover:show_text:'&fOpen the Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FFWelcome back %player%#99E0FF !"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&fJoin the server #858ef8Discord &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Website&8: #99E0FF<hover:show_text:'&fOpen the Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Spawn
 command-set-spawn: "&fYou just set the spawn location."
 command-spawn-not-define: "<error>The spawn does not exist. Please contact an administrator."
diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml
index 45f2ee0f..b80675b0 100644
--- a/src/main/resources/messages/messages_de.yml
+++ b/src/main/resources/messages/messages_de.yml
@@ -237,6 +237,14 @@ first-join-motd:
   - "&7Website&8: #99E0FF<hover:show_text:'&fÖffne die Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FFWillkommen zurück %player%#99E0FF !"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&fTritt dem Server-Discord bei #858ef8Discord &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Website&8: #99E0FF<hover:show_text:'&fÖffne die Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Spawn
 command-set-spawn: "&fDu hast gerade den Spawn-Punkt gesetzt."
 command-spawn-not-define: "<error>Der Spawn-Punkt existiert nicht. Bitte kontaktiere einen Administrator."
diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml
index bbd5c23d..ac139322 100644
--- a/src/main/resources/messages/messages_es.yml
+++ b/src/main/resources/messages/messages_es.yml
@@ -221,6 +221,14 @@ first-join-motd:
   - "&7Sitio web&8: #99E0FF<hover:show_text:'&f¡Abre el sitio web #858ef8!&f'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FF¡Bienvenido de nuevo %player%#99E0FF!"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&f¡Únete al servidor de Discord #858ef8!&f'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Sitio web&8: #99E0FF<hover:show_text:'&f¡Abre el sitio web #858ef8!&f'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Spawn
 command-set-spawn: "&fAcabas de establecer la ubicación del spawn."
 command-spawn-not-define: "<error>El spawn no existe. Por favor, contacta a un administrador."
diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml
index 0ed56ff8..775edeea 100644
--- a/src/main/resources/messages/messages_fr.yml
+++ b/src/main/resources/messages/messages_fr.yml
@@ -258,6 +258,14 @@ first-join-motd:
   - "&7Site Web&8: #99E0FF<hover:show_text:'&fOuvrez le site Web &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FFBon retour parmi nous %player%#99E0FF !"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&fRejoignez le serveur #858ef8Discord &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Site Web&8: #99E0FF<hover:show_text:'&fOuvrez le site Web &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Description des commandes
 description-reload: "Recharger les fichiers de configuration"
 description-gamemode: "Changer le mode de jeu du joueur"
diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml
index 342b3d11..3e213505 100644
--- a/src/main/resources/messages/messages_it.yml
+++ b/src/main/resources/messages/messages_it.yml
@@ -218,6 +218,14 @@ first-join-motd:
   - "&7Sito&8: #99E0FF<hover:show_text:'&fApri il sito &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FFBentornato %player%#99E0FF !"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&fEntra nel server #858ef8Discord &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Sito&8: #99E0FF<hover:show_text:'&fApri il sito &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Spawn
 command-set-spawn: "&fHai appena impostato lo spawn."
 command-spawn-not-define: "<error>Lo spawn non esiste. Contatta gli amministratori."  
diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml
index c28ee1cf..d040b9ed 100644
--- a/src/main/resources/messages/messages_nl.yml
+++ b/src/main/resources/messages/messages_nl.yml
@@ -256,6 +256,14 @@ first-join-motd:
   - "&7Website&8: #99E0FF<hover:show_text:'&fBezoek de Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
   - ""
 
+join-motd:
+  - ""
+  - "#99E0FFWelkom terug %player%#99E0FF !"
+  - ""
+  - "#858ef8Discord&8: #99E0FF<hover:show_text:'&fWord lid van de Discord #858ef8 &f!'><click:open_url:'https://discord.groupez.dev/'>https://discord.groupez.dev/</click></hover>"
+  - "&7Website&8: #99E0FF<hover:show_text:'&fBezoek de Website &f!'><click:open_url:'https://minecraft-inventory-builder.com/'>https://minecraft-inventory-builder.com/</click></hover>"
+  - ""
+
 # Spawn
 command-set-spawn: "&fJe hebt zojuist de spawnlocatie ingesteld."
 command-spawn-first-not-define: "<error>De eerste spawn bestaat niet. Neem contact op met een beheerder."
diff --git a/src/main/resources/modules/join_quit/config.yml b/src/main/resources/modules/join_quit/config.yml
index fea139d6..e332c8ef 100644
--- a/src/main/resources/modules/join_quit/config.yml
+++ b/src/main/resources/modules/join_quit/config.yml
@@ -45,4 +45,14 @@ allow-first-join-broadcast: true
 allow-first-join-motd: true
 
 # The number of ticks before sending the message
-first-join-motd-ticks: 20 # 1 second = 20 ticks
\ No newline at end of file
+first-join-motd-ticks: 20 # 1 second = 20 ticks
+
+# Send a welcome message to the player on each login
+#
+# Available placeholders:
+# %player% - The player's name.
+# %displayName% - The player's display name.
+allow-join-motd: false
+
+# The number of ticks before sending the message after login
+join-motd-ticks: 20 # 1 second = 20 ticks