2 files changed, 7 insertions, 3 deletions

diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index 5c6620f7d..f1922a20e 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -169,7 +169,7 @@ function getZanataContributors () {
 
 function getContributorsBlacklist () {
   return {
-    'Florian Bigard': true,
+    'Bigard Florian': true,
     'chocobozzz': true,
     'Rigel': true
   }
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 27262af42..4c2c5e278 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -1,4 +1,4 @@
-import { FindOptions, literal, Op, QueryTypes } from 'sequelize'
+import { FindOptions, literal, Op, QueryTypes, where, fn, col } from 'sequelize'
 import {
   AfterDestroy,
   AfterUpdate,
@@ -465,7 +465,11 @@ export class UserModel extends Model<UserModel> {
 
     const query = {
       where: {
-        [ Op.or ]: [ { username: { [ Op.iLike ]: username } }, { email } ]
+        [ Op.or ]: [
+          where(fn('lower', col('username')), fn('lower', username)),
+
+          { email }
+        ]
       }
     }