Login working from data access
Merge origin/master