Fix Authentication Query