diff --git a/src/Handler/Utils/Qualification.hs b/src/Handler/Utils/Qualification.hs
index 29582581c..3a92e28d5 100644
--- a/src/Handler/Utils/Qualification.hs
+++ b/src/Handler/Utils/Qualification.hs
@@ -92,7 +92,7 @@ quserBlockAux negCond cutoff checkQualUserId mbBlockCondition = bool E.notExists
         E.where_ $ (qualUserUnblock E.^. QualificationUserBlockUnblock)
             E.&&.  checkQualUserId (qualUserUnblock E.^. QualificationUserBlockQualificationUser)
             E.&&.  qualUserUnblock E.^. QualificationUserBlockFrom E.<=. cutoff
-            E.&&.  qualUserUnblock E.^. QualificationUserBlockFrom E.>. qualUserBlock E.^. QualificationUserBlockFrom
+            E.&&.  qualUserUnblock E.^. QualificationUserBlockFrom E.>=. qualUserBlock E.^. QualificationUserBlockFrom -- in case of identical timestamps, the unblock trumps the block
       )
   whenIsJust mbBlockCondition (E.where_ . ($ qualUserBlock))
 
diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs
index 3cfa94f8a..1920ea43f 100644
--- a/test/Database/Fill.hs
+++ b/test/Database/Fill.hs
@@ -710,7 +710,9 @@ fillDb = do
   qfkleen <- insert' $ QualificationUser gkleen qid_f (n_day 33) (n_day $ -4) (n_day $ -20) True  (n_day' $ -9)
   void . insert  $ QualificationUserBlock qfkleen False (n_day' 1) "Future block"   (Just svaupel)
   void . insert' $ QualificationUser maxMuster  qid_f (n_day    0) (n_day $ -2) (n_day $  -8) False (n_day' $ -1)
-  void . insert' $ QualificationUser svaupel    qid_f (n_day    1) (n_day $ -1) (n_day $  -2) True  (n_day' $ -9)
+  qfvaupel <- insert' $ QualificationUser svaupel    qid_f (n_day    2) (n_day $ -1) (n_day $  -2) True  (n_day' $ -9)
+  void . insert  $ QualificationUserBlock qfvaupel False (n_day' 0) "SameTimeBlock"     (Just jost)
+  void . insert  $ QualificationUserBlock qfvaupel True ( n_day' 0) "SameTimeUnblock"   (Just jost)
   void . insert' $ QualificationUser sbarth     qid_f (n_day  400) (n_day $ -40) (n_day $ -1200) True (n_day' $ -2)
   qftest <- insert' $ QualificationUser tinaTester qid_f (n_day    3) (n_day $ -60) (n_day $ -250) False (n_day' $ -9)
   void . insert  $ QualificationUserBlock qftest False (n_day' $ -7) "Some longer explanation for the block, which explains what has happened here, but is probably to long to be shown inline!" (Just jost)