removed http code
added empty check for user presence