Tightened up registration a bit more, added user check to search results