Added Login and API Token validation