Added more user verfication