Device Registration process repaired