Starting to work on the authentication bug