More preparation for authentication