Tidy up login and lookup endpoints