Updated token and moved login