diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc
index 8e3c7548b1..340c452c89 100644
--- a/APPL/API2/api2.inc
+++ b/APPL/API2/api2.inc
@@ -327,7 +327,12 @@ api2 = {
                                         var safe_val = safe.quoted_sql_wild(filterval);
                                     }
                                     else
-                                        var safe_val = safe.quoted_sql(filterval);
+                                    {
+                                        if (field.caseinsensitive)
+                                            var safe_val = safe.quoted_sql_upper(filterval);
+                                        else
+                                            var safe_val = safe.quoted_sql(filterval);
+                                    }
                                     break;
                                 case "like":
                                     var safe_val = safe.quoted_sql_wild("%"+filterval+"%");
@@ -412,10 +417,14 @@ api2 = {
                       {
                         if (field.islcl)
                             dbs = 'lcl.l({0}, 1)'.format(dbs);
-                        dbs = "UPPER("+dbs+")";
-                        safe_val = safe_val.toUpperCase();
+                        field.caseinsensitive = true;
                       }
                     }
+                    if (field.caseinsensitive)
+                    {
+                        dbs = "UPPER(" + dbs + ")";
+                        safe_val = safe_val.toUpperCase();
+                    }
                     if (filter == "range" && fld.match(/^fclt_d_/))
                     {
                         dbs = "TO_DATE(" + dbs + ",'dd-mm-yyyy')";
diff --git a/APPL/API2/model_prs_perslid.inc b/APPL/API2/model_prs_perslid.inc
index 2232d15c2e..9adda85e4b 100644
--- a/APPL/API2/model_prs_perslid.inc
+++ b/APPL/API2/model_prs_perslid.inc
@@ -122,13 +122,14 @@ function model_prs_perslid(params)
             "dbs": "prs_perslid_email",
             "label": L("lcl_prs_person_email"),
             "typ": "varchar",
-            "filter": "exact"
+            "filter": "exact",
+            "caseinsensitive": true
         },
         "login": {
             "dbs": "prs_perslid_oslogin",
             "label": L("lcl_prs_person_login"),
             "typ": "varchar",
-            "filter": "like"
+            "filter": "exact"
         },
         "employment": {
             "dbs": "prs_perslid_dienstverband",
@@ -172,8 +173,7 @@ function model_prs_perslid(params)
             "dbs": "wg.alg_locatie_key",
             "label": L("lcl_location"),
             "typ": "key",
-            "foreign": "alg_locatie",
-            "filter": "exact"
+            "foreign": "alg_locatie"
         },
         "building": {
             "dbs": "wg.alg_gebouw_key",