Polishing the user handling in replicated scenario