Fixed issue: Fix password reset errors and reference errors