Refactor validation action for singleton issue on server