Fix duplication/persistance error on user panel