Find user functionality, Safety checks added, Addding more checks now