Fix reference in commented out code
Updates for password-compat and Smarty