Fix clearing of servers resetting users server when unnecessary and it not working at all