new login features
Merge branch 'workshop-login-updates'
cleanup