Login 90% complete with token again