Fixed hardware ID registration once again