Fixes to password screen bug, email copy