Upgraded authentication to be more automatic