Restore changes lost in a merge
Fix for compile errors related to changing of password hashing