Adjusting CustomAuthenticationSource for latest changes