diff --git a/app/assets/javascripts/controllers/admin/events.coffee.erb b/app/assets/javascripts/controllers/admin/events.coffee.erb
index 23b0a5e35..c2354d28d 100644
--- a/app/assets/javascripts/controllers/admin/events.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/events.coffee.erb
@@ -256,11 +256,37 @@ Application.Controllers.controller "AdminEventsController", ["$scope", "$state",
         $scope.priceCategories.push(cat)
         growl.success(_t('price_category_successfully_created'))
       , (err)->
-        growl.error(_t('unable_to_add_the_price_category_an_error_occurred'))
+        growl.error(_t('unable_to_add_the_price_category_check_name_already_used'))
         console.error(err)
 
 
 
+  ##
+  # Update the given price category with the new properties
+  # to specify in a modal dialog
+  # @param index {number} index of the caterory in the $scope.priceCategories array
+  # @param id {number} price category ID, must match the ID of the category at the index specified above
+  ##
+  $scope.editPriceCategory = (id, index) ->
+    if $scope.priceCategories[index].id != id
+      growl.error(_t('unexpected_error_occurred_please_refresh'))
+    else
+      $uibModal.open
+        templateUrl: '<%= asset_path "admin/events/price_form.html" %>'
+        size: 'md'
+        resolve:
+          category: -> $scope.priceCategories[index]
+        controller: 'PriceCategoryController'
+      .result['finally'](null).then (p_cat) ->
+        # update the price category to the API
+        PriceCategory.update {id: id}, {price_category: p_cat}, (cat) ->
+          $scope.priceCategories[index] = cat
+          growl.success(_t('price_category_successfully_updated'))
+        , (err)->
+          growl.error(_t('unable_to_update_the_price_category'))
+          console.error(err)
+
+
 
   ### PRIVATE SCOPE ###
 
diff --git a/app/assets/templates/admin/events/prices.html.erb b/app/assets/templates/admin/events/prices.html.erb
index fd5b0dec3..fcca1229b 100644
--- a/app/assets/templates/admin/events/prices.html.erb
+++ b/app/assets/templates/admin/events/prices.html.erb
@@ -16,7 +16,7 @@
       <td>{{ category.events }}</td>
       <td>
         <div class="buttons">
-          <button class="btn btn-default" ng-click="editPriceCategory(category.id)">
+          <button class="btn btn-default" ng-click="editPriceCategory(category.id, $index)">
             <i class="fa fa-edit"></i> <span class="hidden-xs hidden-sm" translate>{{ 'edit' }}</span>
           </button>
           <button class="btn btn-danger" ng-click="removePriceCategory(category.id, $index)">
diff --git a/app/models/price_category.rb b/app/models/price_category.rb
index 419245d30..62036d790 100644
--- a/app/models/price_category.rb
+++ b/app/models/price_category.rb
@@ -2,6 +2,10 @@ class PriceCategory < ActiveRecord::Base
   has_many :event_price_category
   has_many :events, through: :event_price_categories
 
+  validates :name, :presence => true
+  validates :name, uniqueness: {case_sensitive: false}
+  validates :conditions, :presence => true
+
   def safe_destroy
     if event_price_category.count == 0
       destroy
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index cc4bb90b9..a50b21a88 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -100,7 +100,10 @@ en:
         enter_here_the_conditions_under_which_this_price_is_applicable: "Enter here the conditions under which this price is applicable"
         conditions_are_required: "Conditions are required."
         price_category_successfully_created: "Price category successfully created."
-        unable_to_add_the_price_category_an_error_occurred: "Unable to add the price category because of an unexpected error occurred."
+        unable_to_add_the_price_category_check_name_already_used: "Unable to add the price category, check that the name is not already used."
+        unexpected_error_occurred_please_refresh: "An unexpected error occurred, please refresh the page."
+        price_category_successfully_updated: "Price category successfully updated."
+        unable_to_update_the_price_category: "Unable to update the price category."
 
       events_new:
         # add a new event
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 9d8e8011c..fd480fa0e 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -100,7 +100,10 @@ fr:
         enter_here_the_conditions_under_which_this_price_is_applicable: "Saisissez ici les conditions d'application du tarif"
         conditions_are_required: "Les conditions sont requises."
         price_category_successfully_created: "La catégorie tarifaire a bien été créée."
-        unable_to_add_the_price_category_an_error_occurred: "Impossible d'ajouter la catégorie tarifaire car une erreur inattendue est survenue."
+        unable_to_add_the_price_category_check_name_already_used: "Impossible d'ajouter la catégorie tarifaire, vérifiez que le nom n'est pas déjà utilisé."
+        unexpected_error_occurred_please_refresh: "Une erreur inattendue est survenue, merci de rafraîchir la page."
+        price_category_successfully_updated: "La catégorie tarifaire a bien été mise à jour."
+        unable_to_update_the_price_category: "Impossible de mettre à jour la catégorie tarifaire."
 
       events_new:
         # ajouter un nouvel évènement