      [:div.orgname login]
      (cond
        ;; TODO remove the nil check after a migration adds vcs-type to all entities
-       (contains? #{"github" nil} vcs-type)
+       (vcs-github? org)
        [:a.visit-org {:href (str (gh-utils/http-endpoint) "/" login)
                       :target "_blank"}
         [:i.octicon.octicon-mark-github]]
 
-       (= "bitbucket" vcs-type)
+       (vcs-bitbucket? org)
        [:a.visit-org
         [:i.fa.fa-bitbucket]])]))
 

            [frontend.components.forms :refer [managed-button]]
            [frontend.config :as config]
            [frontend.datetime :as datetime]
            [frontend.models.organization :as organization]
            [frontend.models.repo :as repo-model]
            [frontend.models.user :as user-model]

         [:p "CircleCI helps you ship better code, faster. To kick things off, you'll need to pick some projects to build:"]
         [:hr]
         [:div.org-listing
          (om/build (if (feature/enabled? :bitbucket)
                      organization-listing-with-bitbucket
                      organization-listing)
                    {:user user
                     :settings settings
                     :repos repos})]
         [:hr]
         [:div#project-listing.project-listing
          [:div.overview
