diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 391578791..cea97aa92 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -52,7 +52,7 @@ teleport-delay: 0
 
 # The delay, in seconds, a player can't be attacked by other players after he has been teleported by a command
 # This will also prevent that the player can attack other players
-teleport-invulnerability: 0
+teleport-invulnerability: 2
 
 # The delay, in seconds, required between /heal attempts
 heal-cooldown: 60
@@ -315,7 +315,7 @@ repair-enchanted: true
 register-back-in-listener: false
 
 #Delay to wait before people can cause attack damage after logging in 
-login-attack-delay: 0
+login-attack-delay: 5
 
 ############################################################
 # +------------------------------------------------------+ #