TMDM-7974: Updated code to support old password.