Minor changes to serverauthenticate