diff --git a/webui/model/user/auth.php b/webui/model/user/auth.php
index 8a87d575..6c95d794 100644
--- a/webui/model/user/auth.php
+++ b/webui/model/user/auth.php
@@ -487,6 +487,10 @@ class ModelUserAuth extends Model {
 
             AUDIT(ACTION_LOGIN, $username, '', '', 'successful auth against LDAP');
 
+            if(CUSTOM_EMAIL_QUERY_FUNCTION && function_exists(CUSTOM_EMAIL_QUERY_FUNCTION)) {
+               call_user_func(CUSTOM_EMAIL_QUERY_FUNCTION, $username);
+            }
+
             return 1;
          }
 
diff --git a/webui/system/misc.php b/webui/system/misc.php
index d7a89e96..32059b95 100644
--- a/webui/system/misc.php
+++ b/webui/system/misc.php
@@ -425,6 +425,11 @@ function fetch_url($url = '') {
 function fixup_date_condition($field = '', $date1 = 0, $date2 = 0) {
    $date = "";
 
+   // Check if you want to apply a 'not before' value to a non-auditor user
+   if(Registry::get('auditor') == 0 && Registry::get('not_before_date')) {
+      $date1 = Registry::get('not_before_date');
+   }
+
    if($date1) {
       list($y,$m,$d) = preg_split("/(\.|\-|\/)/", $date1);