Changed first two methods of authentication