diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index bea1060183..269e2a3793 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -315,8 +315,14 @@
         (mf/use-fn
          (mf/deps profile)
          (fn []
-           (if (dnt/is-valid-license? profile)
+           (cond
+             (= (get-subscription-type (-> profile :props :subscription)) "unlimited")
+             (st/emit! (dnt/show-nitrate-popup :nitrate-form {:show-contact-sales-option true}))
+
+             (dnt/is-valid-license? profile)
              (dnt/go-to-nitrate-ac-create-org)
+
+             :else
              (st/emit! (dnt/show-nitrate-popup :nitrate-form)))))
 
         on-go-to-cc-click
@@ -755,8 +761,14 @@
         (mf/use-fn
          (mf/deps profile)
          (fn []
-           (if (dnt/is-valid-license? profile)
+           (cond
+             (= (get-subscription-type (-> profile :props :subscription)) "unlimited")
+             (st/emit! (dnt/show-nitrate-popup :nitrate-form {:show-contact-sales-option true}))
+
+             (dnt/is-valid-license? profile)
              (dnt/go-to-nitrate-ac-create-org)
+
+             :else
              (st/emit! (dnt/show-nitrate-popup :nitrate-form)))))]
     (if show-dropdown?
       [:div {:class (stl/css :sidebar-org-switch)}
diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs
index 7021cb9884..b7a4e9a3e6 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.cljs
+++ b/frontend/src/app/main/ui/dashboard/subscription.cljs
@@ -162,11 +162,11 @@
 
         handle-click
         (mf/use-fn
-         (mf/deps nitrate-license subscription-type)
+         (mf/deps subscription-type)
          (fn []
-           (if (= subscription-type "unlimited")
-             (st/emit! (dnt/show-nitrate-popup :nitrate-dialog {:nitrate-license nitrate-license :show-contact-sales-option true}))
-             (st/emit! (dnt/show-nitrate-popup :nitrate-form)))))
+           (st/emit! (dnt/show-nitrate-popup :nitrate-form
+                                             (when (= subscription-type "unlimited")
+                                               {:show-contact-sales-option true})))))
 
         handle-go-to-cc
         (mf/use-fn dnt/go-to-nitrate-ac-create-org)
diff --git a/frontend/src/app/main/ui/nitrate/nitrate_form.cljs b/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
index 138b485151..ef973f111f 100644
--- a/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
+++ b/frontend/src/app/main/ui/nitrate/nitrate_form.cljs
@@ -24,7 +24,8 @@
    ::mf/wrap-props true}
   [connectivity]
 
-  (let [online? (:licenses connectivity)
+  (let [show-contact-sales-option (:show-contact-sales-option connectivity)
+        online? (and (:licenses connectivity) (not show-contact-sales-option))
         profile  (mf/deref refs/profile)
         on-click
         (mf/use-fn