custom user per server
fix merge