   (let [maybe-set-container-id (fn [state]
                                  (if (not (nil? container-id))
                                    (assoc-in state state/current-container-path container-id)
-                                   state))]
+                                   state))
+        nav-org {:login org :vcs_type vcs_type}]
+
     (if (and (= :build (state/current-view state))
              (not (state-utils/stale-current-build? state project-name build-num)))
       ;; page didn't change, just switched tabs

      ;; navigated to page, load everything
      (-> state
        state-utils/clear-page-state
        (assoc state/current-view navigation-point
               state/navigation-data (assoc args :show-settings-link? false)
               :project-settings-project-name project-name)

        (assoc-in state/github-repos-loading-path (user/github-authorized? current-user))
        (assoc-in state/bitbucket-repos-loading-path (user/bitbucket-authorized? current-user))
        (assoc-in state/crumbs-path [{:type :add-projects}])
        (assoc-in state/add-projects-selected-org-path nav-org)
        (assoc-in [:settings :add-projects :repo-filter-string] "")
        (state-utils/reset-current-org)
        (state-utils/change-selected-org nav-org))))

(defn- nav-to-selected-org
  [selected-org nav-ch]
