Simplified some of the things on the new password page. It was a bit messy