Further work on dashboard.login