diff --git a/.gitignore b/.gitignore
index 56b1a8ece..faeac35ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,8 @@
 /app/files/*
 !/app/files/empty
 !/app/files/scripts/
-!/app/files/scripts/tmp/empty
 /app/files/scripts/tmp/*
+!/app/files/scripts/tmp/empty
 /app/tmp/files/*
 !/app/files/empty
 /app/webroot/img/logo.png
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 30aca6770..79d32bcb9 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -181,10 +181,10 @@ class UsersController extends AppController {
 						$test = array();
 						foreach ($pieces as $piece) {
 							if ($piece[0] == '!') {
-								if ($searchTerm == 'email' || $searchTerm == 'org') $this->paginate['conditions']['AND'][] = array('LOWER(User.' . $searchTerm . ') NOT LIKE' => '%' . substr($piece, 1) . '%');
+								if ($searchTerm == 'email' || $searchTerm == 'org') $this->paginate['conditions']['AND'][] = array('LOWER(User.' . $searchTerm . ') NOT LIKE' => '%' . strtolower(substr($piece, 1)) . '%');
 								else $this->paginate['conditions']['AND'][] = array('User.' . $searchTerm => substr($piece, 1));
 							} else {
-								if ($searchTerm == 'email' || $searchTerm == 'org') $test['OR'][] = array('LOWER(User.' . $searchTerm . ') LIKE' => '%' . $piece . '%');
+								if ($searchTerm == 'email' || $searchTerm == 'org') $test['OR'][] = array('LOWER(User.' . $searchTerm . ') LIKE' => '%' . strtolower($piece) . '%');
 								else $test['OR'][] = array('User.' . $searchTerm => $piece);
 							}
 						}