Fix for issue that password reset did not work; improved password reset forms