diff --git a/0functions.sk b/0functions.sk
index acb0592..cf3cdfe 100644
--- a/0functions.sk
+++ b/0functions.sk
@@ -22,3 +22,11 @@ function ScriptList(addRemove: text, list: text):
         add {_list} to {scripts::*}
     if {_addRemove} is "remove":
         remove {_list} from {scripts::*}
+
+function userOrNick(player: player) :: text:
+    set {_uuid} to uuid of {_player}
+    if {nick.%{_uuid}%} is set:
+        set {_res} to {nick.%{_uuid}%}
+    else:
+        set {_res} to name of {_player}
+    return {_res}
diff --git a/chat.sk b/chat.sk
index 72560a5..84f2f8a 100644
--- a/chat.sk
+++ b/chat.sk
@@ -5,39 +5,42 @@ on unload:
 
 on chat: # chat
     cancel event
-    if {nick.%uuid of player%} is set:
-        set {_player} to {nick.%uuid of player%}
-    else:
-        set {_player} to player's name
+    set {_player} to userOrNick(player)
     broadcast "<%{_player}%&r> %colored message%" in world of player
 
-command nickname [<player>] <text>: # changement de pseudo
+command nickname [<player>] [<text>]: # changement de pseudo
     executable by: players
     aliases: nick
     description: Change ton nom ou celui d'un autre joueur. (max 15 charactères)
     trigger:
-        if player is op:
-            set {_playerUUID} to uuid of player
-            set {_player} to player
-            set {_playerNAME} to player
-            if arg-1 is set:
-                set {_playerUUID} to uuid of arg-1
-                set {_player} to arg-1
-            if player is {_player}:
-                set {_playerNAME} to "vous"
+        set {_playerUUID} to uuid of player
+        set {_player} to player
+        set {_playerNAME} to player
+        if arg-1 is set:
+            set {_playerUUID} to uuid of arg-1
+            set {_player} to arg-1
+        if arg-2 is not set:
+            if {nick.%{_playerUUID}%} is set:
+                set {_deb} to "Le surnom de %{_playerNAME}%"
+                if player is {_player}:
+                    set {_deb} to "Votre surnom"
+                send "%{_deb}% est : %{nick.%{_playerUUID}%}%"
             else:
-                send "&aSurnom changé."
-            if arg-2 is "off":
-                delete {nick.%{_playerUUID}%}
-                send "&6Tu n'as plus de surnom. (changé par %player%&6)" to {_player}
-            else:
-                if length of arg-2 is greater than 15:
-                    send "&4Ce surnom est trop long."
-                else:
-                    set {nick.%{_playerUUID}%} to colored arg-2
-                    send "&6Ton surnom est désormais &r%{nick.%{_playerUUID}%}%&6. (changé par %{_playerNAME}%&6)" to {_player}
+                send "Tu n'as pas de surnom. Nom d'affichage : %{_playerNAME}%"
+            stop
+        if player is {_player}:
+            set {_playerNAME} to "vous"
         else:
-            send option("errorMessage")
+            send "&aSurnom changé."
+        if arg-2 is "off":
+            delete {nick.%{_playerUUID}%}
+            send "&6Tu n'as plus de surnom. (changé par %player%&6)" to {_player}
+        else:
+            if length of arg-2 is greater than 15:
+                send "&4Ce surnom est trop long."
+            else:
+                set {nick.%{_playerUUID}%} to colored arg-2
+                send "&6Ton surnom est désormais &r%{nick.%{_playerUUID}%}%&6. (changé par %{_playerNAME}%&6)" to {_player}
 
 command msg <player> <text>: # DM
     executable by: players
diff --git a/main.sk b/main.sk
index 8354ec0..93f6fd2 100644
--- a/main.sk
+++ b/main.sk
@@ -78,7 +78,7 @@ command rename <text>: # renomme l'item dans la main du joueur
                 set {_name} to colored arg-1
                 replace all "&" with "§" in {_name}
                 send "&eL'item &r%player's tool%&e est renommé en ""&r%{_name}%&e""."
-                set the name of the player's tool to "§r%{_name}%"
+                set name of the player's tool to "§r%{_name}%"
         else:
             send option("errorMessage")