diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index e70d5d07e5..f6410c7894 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -101,8 +101,9 @@ class RuleController extends Controller
         // has old input?
         if (Input::old()) {
             // process old triggers.
+            $newIndex = 0;
             foreach (Input::old('rule-trigger') as $index => $entry) {
-                $count = ($index + 1);
+                $count = ($newIndex + 1);
                 $triggerCount++;
                 $oldTrigger    = $entry;
                 $oldValue      = Input::old('rule-trigger-value')[$index];
@@ -117,6 +118,7 @@ class RuleController extends Controller
                         'count'      => $count
                     ]
                 )->render();
+                $newIndex++;
             }
 //            echo '<pre>';
 //            var_dump(Input::old());
diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php
index 181f573a8c..521ecf3d43 100644
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -49,7 +49,10 @@ class RuleFormRequest extends Request
             'description'     => 'between:1,5000',
             'stop_processing' => 'boolean',
             'trigger'         => 'required|in:store-journal,update-journal',
-            'rule-trigger.*'  => 'required|in:' . join(',', $validTriggers)
+            'rule-trigger.*'  => 'required|in:' . join(',', $validTriggers),
+            'rule-trigger-value.*'  => 'required|min:1'
+
+            
         ];
     }
 }
diff --git a/public/js/rules/edit.js b/public/js/rules/create.js
similarity index 88%
rename from public/js/rules/edit.js
rename to public/js/rules/create.js
index 581ece4714..9182c31001 100644
--- a/public/js/rules/edit.js
+++ b/public/js/rules/create.js
@@ -11,7 +11,10 @@
 $(function () {
     "use strict";
     console.log("edit");
-    addNewTrigger();
+    if (triggerCount == 0) {
+        addNewTrigger();
+    }
+
     addNewAction();
     $('.add_rule_trigger').click(function () {
         addNewTrigger();
diff --git a/resources/views/rules/partials/trigger.twig b/resources/views/rules/partials/trigger.twig
index d74d993ab5..20b5d86a04 100644
--- a/resources/views/rules/partials/trigger.twig
+++ b/resources/views/rules/partials/trigger.twig
@@ -19,7 +19,14 @@
         </select>
     </td>
     <td>
-        <input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]" class="form-control">
+
+        <input type="text" value="{{ oldValue }}" name="rule-trigger-value[{{ count }}]"
+               class="form-control">
+        {% if errors.has(('rule-trigger-value.'~count)) %}
+        <p class="text-danger">
+            {{ errors.first('rule-trigger-value.'~count) }}
+        </p>
+        {% endif %}
     </td>
     <td style="width:20%;">
         <div class="checkbox">
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index c1bee36cd2..5a35d69925 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -42,9 +42,6 @@
                     <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
                 </div>
                 <!-- display any error -->
-                {% if errors.has('rule-trigger.1') %}
-                    {{ errors.first('rule-trigger.1') }}
-                {% endif %}
                 <div class="box-body rule-trigger-box">
                     <table class="table table-condensed table-bordered table-striped">
                         <thead>
@@ -128,5 +125,5 @@
         var triggerCount = {{ triggerCount }};
         var actionCount = {{ actionCount }};
     </script>
-    <script type="text/javascript" src="js/rules/edit.js"></script>
+    <script type="text/javascript" src="js/rules/create.js"></script>
 {% endblock %}