Refactor the way an admin port connection is established