diff --git a/FaustBot/Modules/First_Greeter.py b/FaustBot/Modules/First_Greeter.py
index b1d9f6c..80a2b94 100644
--- a/FaustBot/Modules/First_Greeter.py
+++ b/FaustBot/Modules/First_Greeter.py
@@ -2,6 +2,8 @@ from FaustBot.Communication.Connection import Connection
 from FaustBot.Modules.JoinObserverPrototype import JoinObserverPrototype
 from FaustBot.Model.UserProvider import UserProvider
 from time import sleep
+
+
 class First_Greeter(JoinObserverPrototype):
     """
     A Class only reacting to pings
@@ -20,12 +22,15 @@ class First_Greeter(JoinObserverPrototype):
         self.first_greeting = greeting
 
     def update_on_join(self, data, connection: Connection):
-        if data['channel'] == connection.details.get_channel():
-            if data['nick'].find("Guest") != -1:
+        if data["channel"] == connection.details.get_channel():
+            new_nick = data["nick"]
+            if (
+                new_nick.startswith("Guest")
+                or UserProvider().get_characters(new_nick) < 100
+            ):
                 sleep(20)
-                connection.send_back(self.first_greeting + " " + data['nick'], data)
-                return
-            UProvider= UserProvider()
-            if(UProvider.get_characters(data['nick'])) < 100:
-                sleep(20)
-                connection.send_back(self.first_greeting + " " + data['nick'], data)
\ No newline at end of file
+                if "{NICK}" in self.first_greeting:
+                    greeting = self.first_greeting.replace("{NICK}", new_nick)
+                else:
+                    greeting = f"{self.first_greeting} {new_nick}"
+                connection.send_back(greeting, data)