Fix factory reset since users refactor

Ticket:	#3425