diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java
index b8368609..75ebc3ca 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java
@@ -140,7 +140,8 @@ public class SEBClientConfigDAOImpl implements SEBClientConfigDAO {
                         isLikeWhenPresent(filterMap.getName()))
                 .and(
                         SebClientConfigRecordDynamicSqlSupport.date,
-                        isGreaterThanOrEqualToWhenPresent(filterMap.getSEBClientConfigFromTime()))
+                        isGreaterThanOrEqualToWhenPresent(filterMap.getSEBClientConfigFromTime()),
+                        or(SebClientConfigRecordDynamicSqlSupport.active, isNotEqualTo(0)))
                 .and(
                         SebClientConfigRecordDynamicSqlSupport.active,
                         isEqualToWhenPresent(filterMap.getActiveAsInt()))
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 0d616dea..2f49658f 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -932,8 +932,8 @@ sebserver.clientconfig.list.column.name=Name
 sebserver.clientconfig.list.column.name.tooltip=The name of the connection configuration<br/><br/>Use the filter above to narrow down to a specific name<br/>{0}
 sebserver.clientconfig.list.column.name.filter.tooltip=Use the filter to narrow down to a specific name
 sebserver.clientconfig.list.column.date=Creation Date {0}
-sebserver.clientconfig.list.column.date.tooltip=The date when the connection configuration was first created<br/><br/>Use the filter above to specify a from-date<br/>{0}
-sebserver.clientconfig.list.column.date.filter.tooltip=Use the filter to specify a from-date
+sebserver.clientconfig.list.column.date.tooltip=The date when the connection configuration was first created<br/><br/>Use the filter above to specify a date.<br/>Note that this filter only applies to inactive configurations. Active configuration will still be shown even if the creation date is earlier then the filter date.<br/>{0}
+sebserver.clientconfig.list.column.date.filter.tooltip=Use the filter to specify a date.<br/>Note that this filter only applies to inactive configurations. Active configuration will still be shown even if the creation date is earlier then the filter date.
 sebserver.clientconfig.list.column.active=Status
 sebserver.clientconfig.list.column.active.tooltip=The status of connection configuration<br/><br/>Use the filter above to specify the status<br/>{0}
 sebserver.clientconfig.list.column.active.filter.tooltip=Use the filter to specify the status