diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
index f33efcf8a6f..84e4baaf96c 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -630,7 +630,13 @@ public void onPlayerLoginBanned(final PlayerLoginEvent event) {
                 } else {
                     banEntry = ess.getServer().getBanList(BanList.Type.IP).getBanEntry(event.getAddress().getHostAddress());
                     if (banEntry != null) {
-                        event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
+                        final Date banExpiry = banEntry.getExpiration();
+                        if (banExpiry != null) {
+                            final String expiry = DateUtil.formatDateDiff(banExpiry.getTime());
+                            event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("tempbanIpJoin", expiry, banEntry.getReason())));
+                        } else {
+                            event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
+                        }
                     }
                 }
             }
@@ -680,7 +686,13 @@ public void onPlayerKickBanned(final AsyncPlayerPreLoginEvent event) {
                 } else {
                     banEntry = ess.getServer().getBanList(BanListType.IP).getBanEntry(event.getAddress());
                     if (banEntry != null) {
-                        event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
+                        final Date banExpiry = banEntry.getExpiration();
+                        if (banExpiry != null) {
+                            final String expiry = DateUtil.formatDateDiff(banExpiry.getTime());
+                            event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("tempbanIpJoin", expiry, banEntry.getReason())));
+                        } else {
+                            event.setKickMessage(AdventureUtil.miniToLegacy(tlLiteral("banIpJoin", banEntry.getReason())));
+                        }
                     }
                 }
             } else if (event.getLoginResult() == AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST) {
diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties
index a5ca40a2387..38983e3efd8 100644
--- a/Essentials/src/main/resources/messages.properties
+++ b/Essentials/src/main/resources/messages.properties
@@ -66,6 +66,7 @@ banExempt=<dark_red>You cannot ban that player.
 banExemptOffline=<dark_red>You may not ban offline players.
 banFormat=<secondary>You have been banned\:\n<reset>{0}
 banIpJoin=Your IP address is banned from this server. Reason\: {0}
+tempbanIpJoin=Your IP address is temporarily banned from this server for {0}. Reason\: {1}
 banJoin=You are banned from this server. Reason\: {0}
 banipCommandDescription=Bans an IP address.
 banipCommandUsage=/<command> <address> [reason]
diff --git a/Essentials/src/main/resources/messages_pl.properties b/Essentials/src/main/resources/messages_pl.properties
index e0078f72b19..472b928b19a 100644
--- a/Essentials/src/main/resources/messages_pl.properties
+++ b/Essentials/src/main/resources/messages_pl.properties
@@ -66,6 +66,7 @@ banExempt=<dark_red>Nie możesz zablokować tego gracza.
 banExemptOffline=<dark_red>Nie możesz blokować niedostępnych graczy.
 banFormat=<dark_red>Zablokowano cię\: {0}
 banIpJoin=Twój adres IP został na tym serwerze zablokowany. Powód\: {0}
+tempbanIpJoin=Twój adres IP został na tym serwerze zablokowany na {0}. Powód\: {1}
 banJoin=Zablokowano cię na tym serwerze. Powód\: {0}
 banipCommandDescription=Blokuje adres IP.
 banipCommandUsage=/<command> <adres> [powód]