diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 0df61ee1c2..a4b14d5930 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -143,7 +143,7 @@ $form_filter .= '<td class="w33p">'.html_print_label_input_block(
 ).'</td>';
 
 $form_filter .= '<td class="w33p">'.html_print_label_input_block(
-    __('Priority'),
+    __('Severity'),
     html_print_select(
         get_priorities(),
         'priority',
diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php
index 13ae972233..010dbe9f17 100644
--- a/pandora_console/godmode/alerts/alert_view.php
+++ b/pandora_console/godmode/alerts/alert_view.php
@@ -127,7 +127,7 @@ $table_details->data[] = $data;
 
 $priorities = get_priorities();
 
-$data[0] = __('Priority');
+$data[0] = __('Severity');
 $data[1] = '<span title="'.$priorities[$template['priority']].'" class="'.get_priority_class($template['priority']).' span_priority">&nbsp</span>'.$priorities[$template['priority']];
 $table_details->data[] = $data;
 
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index 33ed7b6dca..fea4d987be 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -1235,9 +1235,9 @@ if ($step == 2) {
     );
 
     $table->data[2][0] = html_print_label_input_block(
-        __('Priority'),
+        __('Severity'),
         html_print_select(
-            get_priorities(),
+            get_priorities(false, true),
             'priority',
             $priority,
             '',
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index c0fef7bec0..9c84addf4d 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1614,9 +1614,9 @@ if ($create_alert || $update_alert) {
     echo '</td>';
     echo '<td class="w50p">';
     echo html_print_label_input_block(
-        __('Priority'),
+        __('Severity'),
         html_print_select(
-            get_priorities(),
+            get_priorities(false, true),
             'priority',
             $priority,
             '',
@@ -1776,7 +1776,7 @@ if ($create_alert || $update_alert) {
     );
 
     $table_filter->data[0][2] = html_print_label_input_block(
-        __('Priority'),
+        __('Severity'),
         html_print_select(
             get_priorities(),
             'priority_filter',
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 083fda60d8..3541335fad 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1404,7 +1404,7 @@ function get_event_types($id_type=false)
  *
  * @return array An array with all the priorities.
  */
-function get_priorities($priority_param=false)
+function get_priorities($priority_param=false, $creation=false)
 {
     global $config;
 
@@ -1416,9 +1416,12 @@ function get_priorities($priority_param=false)
     $priorities[EVENT_CRIT_WARNING] = __('Warning');
     $priorities[EVENT_CRIT_MAJOR] = __('Major');
     $priorities[EVENT_CRIT_CRITICAL] = __('Critical');
-    $priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical');
     $priorities[EVENT_CRIT_NOT_NORMAL] = __('Not normal');
-    $priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal');
+
+    if ($creation === false) {
+        $priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical');
+        $priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal');
+    }
 
     foreach ($priorities as $key => $priority) {
         $priorities[$key] = ui_print_truncate_text($priority, GENERIC_SIZE_TEXT, false, true, false);