diff --git a/files/classes/user.py b/files/classes/user.py
index 3d99124a19..505f1c714e 100755
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -493,10 +493,12 @@ class User(Base):
 		g.db.add(self)
 
 
-
 	@property
 	@lazy
 	def is_suspended(self):
+		if self.unban_utc and self.unban_utc > time.time():
+			self.is_banned = 0
+			self.unban_utc = 0
 		return (self.is_banned and (not self.unban_utc or self.unban_utc > time.time()))