More standardized authentication calling #1