Yet more bug fixes for Server and username list