Authetication fix