added check for no answer
added admin user checking