diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb
index dd10930fb..4b6bd6b3a 100644
--- a/app/controllers/admin/budget_investments_controller.rb
+++ b/app/controllers/admin/budget_investments_controller.rb
@@ -51,7 +51,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
 
     def budget_investment_params
       params.require(:budget_investment)
-            .permit(:title, :description, :external_url, :heading_id, :administrator_id, :valuation_tag_list, :incompatible,
+            .permit(:title, :description, :external_url, :heading_id, :administrator_id, :tag_list, :valuation_tag_list, :incompatible,
                     :selected, valuator_ids: [])
     end
 
diff --git a/app/views/admin/budget_investments/_written_by_author.html.erb b/app/views/admin/budget_investments/_written_by_author.html.erb
index a913aff00..8cf2eca57 100644
--- a/app/views/admin/budget_investments/_written_by_author.html.erb
+++ b/app/views/admin/budget_investments/_written_by_author.html.erb
@@ -56,3 +56,8 @@
 <% end %>
 
 <%= safe_html_with_links @investment.description %>
+
+<p id="user-tags">
+  <strong><%= t("admin.budget_investments.show.user_tags") %>: </strong>
+  <%= @investment.tag_list.sort.join(', ') %>
+</p>
diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb
index c33039021..ab843cf24 100644
--- a/app/views/admin/budget_investments/edit.html.erb
+++ b/app/views/admin/budget_investments/edit.html.erb
@@ -18,6 +18,13 @@
       <%= f.cktext_area :description, maxlength: Budget::Investment.description_max_length, ckeditor: { language: I18n.locale } %>
     </div>
 
+    <div class="small-12 column">
+      <%= f.label :tag_list, t("admin.budget_investments.edit.user_tags") %>
+      <%= f.text_field :tag_list,
+                       value: @investment.tag_list.sort.join(','),
+                       label: false %>
+    </div>
+
     <div class="small-12 column">
       <%= f.text_field :external_url %>
     </div>
@@ -39,7 +46,7 @@
 
 
     <div class="small-12 column">
-      <%= f.label :tag_list, t("admin.budget_investments.edit.tags") %>
+      <%= f.label :valuation_tag_list, t("admin.budget_investments.edit.tags") %>
       <div class="tags">
         <% @tags.each do |tag| %>
           <a class="js-add-tag-link"><%= tag.name %></a>
diff --git a/app/views/admin/budget_investments/show.html.erb b/app/views/admin/budget_investments/show.html.erb
index f220c0955..5fa35a1fa 100644
--- a/app/views/admin/budget_investments/show.html.erb
+++ b/app/views/admin/budget_investments/show.html.erb
@@ -19,7 +19,7 @@
 <p id="tags">
   <strong><%= t("admin.budget_investments.show.tags") %>:</strong>
 
-  <%= @investment.tags_on(:valuation).pluck(:name).join(', ') %>
+  <%= @investment.tags_on(:valuation).pluck(:name).sort.join(', ') %>
 </p>
 
 <p id="assigned_valuators">
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 823d7084b..b9c0c625f 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -157,6 +157,7 @@ en:
         dossier: Dossier
         edit_dossier: Edit dossier
         tags: Tags
+        user_tags: User tags
         undefined: Undefined
         milestone: Milestone
         new_milestone: Create new milestone
@@ -181,6 +182,7 @@ en:
         assigned_valuators: Valuators
         select_heading: Select heading
         submit_button: Update
+        user_tags: User assigned tags
         tags: Tags
         tags_placeholder: "Write the tags you want separated by commas (,)"
         undefined: Undefined
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 8d0b6cbf8..53e6c53bc 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -157,6 +157,7 @@ es:
         dossier: Informe
         edit_dossier: Editar informe
         tags: Etiquetas
+        user_tags: Etiquetas del usuario
         undefined: Sin definir
         milestone: Seguimiento
         new_milestone: Crear nuevo hito
@@ -181,6 +182,7 @@ es:
         assigned_valuators: Evaluadores
         select_heading: Seleccionar partida
         submit_button: Actualizar
+        user_tags: Etiquetas asignadas por el usuario
         tags: Etiquetas
         tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)"
         undefined: Sin definir
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 7252e2660..1ad89e6aa 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -421,20 +421,37 @@ feature 'Admin budget investments' do
       end
     end
 
-    scenario "Only displays valuation tags" do
+    scenario "Changes valuation and user generated tags" do
       budget_investment = create(:budget_investment, tag_list: 'Park')
       budget_investment.set_tag_list_on(:valuation, 'Education')
       budget_investment.save
 
       visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
 
-      expect(page).to     have_content "Education"
-      expect(page).to_not have_content "Park"
+      within("#user-tags") do
+        expect(page).to_not have_content "Education"
+        expect(page).to have_content "Park"
+      end
 
       click_link 'Edit classification'
 
-      expect(page).to     have_content "Education"
-      expect(page).to_not have_content "Park"
+      fill_in 'budget_investment_tag_list', with: 'Park, Trees'
+      fill_in 'budget_investment_valuation_tag_list', with: 'Education, Environment'
+      click_button 'Update'
+
+      visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment)
+
+      within("#user-tags") do
+        expect(page).to_not have_content "Education"
+        expect(page).to_not have_content "Environment"
+        expect(page).to have_content "Park, Trees"
+      end
+
+      within("#tags") do
+        expect(page).to have_content "Education, Environment"
+        expect(page).to_not have_content "Park"
+        expect(page).to_not have_content "Trees"
+      end
     end
 
     scenario "Maintains user tags" do