Fixing double auth issue