User persistance issues solved