Reduce support note size (Fixes #290)
Only show email validation nag when appropriate (Fixes #287)
Simplify alternate login
Merge remote branch 'origin/master'