User persistence fixed