diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
index 99de1227a..144a9a213 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
@@ -125,14 +125,14 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
     }
 
     private String getStatus(Player similarPlayer) {
+        if (similarPlayer.getType().equals(""))
+            return "Banned permanently";
         if (similarPlayer.getBannedUntil() != null) {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             return "Banned until " + format.format(similarPlayer.getBannedUntil());
         }
         if (similarPlayer.getType().contains("n"))
             return "Unbanned";
-        if (similarPlayer.getType().equals(""))
-            return "Banned permanently";
         return "OK";
     }
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java
index ffada8fbe..2cc686e61 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java
@@ -88,7 +88,7 @@ public class DbPlayerDAO implements PlayerDAO {
     public boolean banPlayerPermanently(String login) throws SQLException {
         Connection conn = _dbAccess.getDataSource().getConnection();
         try {
-            PreparedStatement statement = conn.prepareStatement("update player set type='' where name=?");
+            PreparedStatement statement = conn.prepareStatement("update player set type='', banned_until=null where name=?");
             try {
                 statement.setString(1, login);
                 return statement.executeUpdate() == 1;
@@ -104,7 +104,7 @@ public class DbPlayerDAO implements PlayerDAO {
     public boolean banPlayerTemporarily(String login, long dateTo) throws SQLException {
         Connection conn = _dbAccess.getDataSource().getConnection();
         try {
-            PreparedStatement statement = conn.prepareStatement("update player set banned_until=? where name=?");
+            PreparedStatement statement = conn.prepareStatement("update player set banned_until=?, type='un' where name=?");
             try {
                 statement.setLong(1, dateTo);
                 statement.setString(2, login);