Moved password reset/change forms to correct location