Password reset - make emails friendlier and fix blank page