Auth method enhanced