Fix for server client -> user