Fix
Smarter authentication