Fixed bug with database user search. Had bad syntax
Merge conflict