login works for admin user
Merge branch 'login'
fixes merge conflicts
fixes merge conflicts