diff --git a/app/controllers/SeminaryController.inc b/app/controllers/SeminaryController.inc
index afdea5f8..b20f4d3c 100644
--- a/app/controllers/SeminaryController.inc
+++ b/app/controllers/SeminaryController.inc
@@ -165,6 +165,11 @@
 			// Check conditions
 			foreach($achievements as &$achievement)
 			{
+				// Check deadline
+				if($achievement['deadline'] < date('Y-m-d H:i:s')) {
+					continue;
+				}
+				
 				// Get conditions
 				$conditions = array();
 				$progress = 0;
@@ -237,6 +242,11 @@
 					break;
 				}
 				
+				// Do not achieve Achievements without conditions
+				if(empty($conditions)) {
+					continue;
+				}
+				
 				// Check conditions
 				$achieved = ($achievement['all_conditions'] == 1);
 				foreach($conditions as &$condition)