Authenticate adapted to verify to DB
Merge origin/master