Bug fix: password reset bugs now fixed