diff --git a/web/app/views/clients/_header.html.erb b/web/app/views/clients/_header.html.erb
index e56efec0d..a9dd72fd8 100644
--- a/web/app/views/clients/_header.html.erb
+++ b/web/app/views/clients/_header.html.erb
@@ -12,10 +12,12 @@
     <%= render "users/user_dropdown" %>
 
     <!-- shopping cart -->
-    <!-- TODO VRFS-1849: Uncomment this when rest of feature developed:
+    <% if Rails.application.config.jam_tracks_available %>
     <a href="/client#/shoppingCart" class="header-shopping-cart">
       <img id="header-shopping-cart" src="/assets/content/shopping-cart.png"/>
     </a>
+    <% end %>
+
     -->
 
     <!-- Templates -->
diff --git a/web/app/views/dialogs/_recordingFinishedDialog.html.haml b/web/app/views/dialogs/_recordingFinishedDialog.html.haml
index fc3d53eff..a14586db6 100644
--- a/web/app/views/dialogs/_recordingFinishedDialog.html.haml
+++ b/web/app/views/dialogs/_recordingFinishedDialog.html.haml
@@ -23,19 +23,19 @@
       .field.w100.left{:purpose => "description"}
         %label{:for => "description"} Description:
         %textarea#claim-recording-description.w100{:name => "description"}
-      / TODO VRFS-1849: Uncomment this when rest of feature developed:
-      / .field.left{:purpose => "save_video"}
-      /   %input{:checked => "checked", :name => "save_video", :type => "checkbox"}/
-      /   %label{:for => "save_video"} Save Video to Computer
-      / .field.left{:purpose => "upload_to_youtube"}
-      /   %span
-      /     %input{:checked => "checked", :name => "upload_to_youtube", :type => "checkbox"}/
-      /     %label{:for => "upload_to_youtube"} Upload Video to YouTube
-      /   %span
-      /     = render(:partial => "shared/google_login")
-      .field.left{:purpose => "is_public"}
-        %input{:checked => "checked", :name => "is_public", :type => "checkbox"}/
-        %label{:for => "is_public"} Public Recording
+      - if Rails.application.config.jam_tracks_available
+        .field.left{:purpose => "save_video"}
+          %input{:checked => "checked", :name => "save_video", :type => "checkbox"}/
+          %label{:for => "save_video"} Save Video to Computer
+        .field.left{:purpose => "upload_to_youtube"}
+          %span
+            %input{:checked => "checked", :name => "upload_to_youtube", :type => "checkbox"}/
+            %label{:for => "upload_to_youtube"} Upload Video to YouTube
+          %span
+            = render(:partial => "shared/google_login")
+        .field.left{:purpose => "is_public"}
+          %input{:checked => "checked", :name => "is_public", :type => "checkbox"}/
+          %label{:for => "is_public"} Public Recording
         / <a href="#"><<img src="images/shared/icon_help.png" width="12" height="12" /></a>
     .left.w50.ml30
       Preview Recording:
diff --git a/web/config/application.rb b/web/config/application.rb
index 08d42e215..4c502e07f 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -284,5 +284,7 @@ if defined?(Bundler)
     config.scoring_get_work_backoff_interval = 60 * 1000 # how much time between failed getwork requests
 
     config.recordings_stale_time = 3  # num days of inactivity before we decide that a recording is no longer going to be claimed
+
+    config.jam_tracks_available = false
   end
 end
diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb
index 3cc7be84b..fd950b0b3 100644
--- a/web/config/environments/development.rb
+++ b/web/config/environments/development.rb
@@ -88,6 +88,4 @@ SampleApp::Application.configure do
   # For product = JamKazamDev
   config.youtube_developer_key = "AI39si5bPqiNc5GQHscWJh9Wl1WTAr9aZqr_YncUvaR7Kz0rgPdBVWVubHZ94xZ3KLIBqtE9mu3VZe-UpMU80QxXoC66kBNp7A"  
   config.youtube_app_name = "JamKazamDev"
-
-  config.jam_tracks_available=false
 end
diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb
index 5f2faac49..ba71cf8c2 100644
--- a/web/config/environments/test.rb
+++ b/web/config/environments/test.rb
@@ -98,6 +98,6 @@ SampleApp::Application.configure do
   # Use Public Keys to identify your site when using Recurly.js. See https://docs.recurly.com/js/#include to learn more.
   config.recurly_public_api_key = 'sc-s6G2OA80Rwyvsb1RmS3mAE'
   config.recurly_subdomain = 'jamkazam-test'  
-  config.jam_tracks_available=true
+  config.jam_tracks_available = true
 end