User persistance fixed