diff --git a/html/forms/create-alert-item.inc.php b/html/forms/create-alert-item.inc.php
index e11c56124..152733d2c 100644
--- a/html/forms/create-alert-item.inc.php
+++ b/html/forms/create-alert-item.inc.php
@@ -27,7 +27,7 @@ $invert = mres($_POST['invert']);
 $name = mres($_POST['name']);
 
 if(empty($rule)) {
-    $update_message = "ERROR: No rule was generated";
+    $update_message = "ERROR: No rule was generated - did you forget to click and / or?";
 } elseif(validate_device_id($_POST['device_id']) || $_POST['device_id'] == '-1' || $_POST['device_id'][0] == ':') {
     $device_id = $_POST['device_id'];
     if(!is_numeric($count)) {
diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php
index 59f464e3b..0eba7bd0c 100644
--- a/html/includes/modal/new_alert_rule.inc.php
+++ b/html/includes/modal/new_alert_rule.inc.php
@@ -32,10 +32,15 @@ if(is_admin() !== false) {
             <input type="hidden" name="device_id" id="device_id" value="">
             <input type="hidden" name="alert_id" id="alert_id" value="">
             <input type="hidden" name="type" id="type" value="create-alert-item">
+        <div class="form-group">
+            <div class="col-sm-12">
+                <span id="ajax_response"></span>
+            </div>
+        </div>
         <div class="form-group">
                 <label for='entity' class='col-sm-3 control-label'>Entity: </label>
                 <div class="col-sm-5">
-                        <input type='text' id='suggest' name='entity' class='form-control' placeholder='I.e: devices.status'/>
+                        <input type='text' id='suggest' name='entity' class='form-control has-feedback' placeholder='I.e: devices.status'/>
                 </div>
         </div>
         <div class="form-group">
@@ -61,15 +66,16 @@ if(is_admin() !== false) {
         <div class="form-group">
                 <label for='value' class='col-sm-3 control-label'>Value: </label>
                 <div class="col-sm-5">
-                        <input type='text' id='value' name='value' class='form-control'/>
+                        <input type='text' id='value' name='value' class='form-control has-feedback'/> <span id="next-step-value"></span>
                 </div>
         </div>
 
         <div class="form-group">
                 <label for='rule-glue' class='col-sm-3 control-label'>Connection: </label>
                 <div class="col-sm-5">
-                        <button class="btn btn-default btn-sm" type="submit" name="rule-glue" value="&&" id="and" name="and">And</button>
-                        <button class="btn btn-default btn-sm" type="submit" name="rule-glue" value="||" id="or" name="or">Or</button>
+                        <button class="btn btn-default btn-sm btn-warning" type="submit" name="rule-glue" value="&&" id="and" name="and">And</button>
+                        <button class="btn btn-default btn-sm btn-warning" type="submit" name="rule-glue" value="||" id="or" name="or">Or</button>
+                        <span id="next-step-and"></span>
                 </div>
         </div>
         <div class="form-group">
@@ -126,7 +132,7 @@ if(is_admin() !== false) {
         </div>
         <div class="form-group">
                 <div class="col-sm-offset-3 col-sm-3">
-                        <button class="btn btn-default btn-sm" type="submit" name="rule-submit" id="rule-submit" value="save">Save Rule</button>
+                        <button class="btn btn-success btn-sm" type="submit" name="rule-submit" id="rule-submit" value="save">Save Rule</button>
                 </div>
         </div>
 </form>
@@ -303,6 +309,7 @@ $('#map-stub').typeahead({
 
 $('#and, #or').click('', function(e) {
     e.preventDefault();
+    $("#next-step-and").html("");
     var entity = $('#suggest').val();
     var condition = $('#condition').val();
     var value = $('#value').val();
@@ -329,22 +336,42 @@ $('#rule-submit').click('', function(e) {
         url: "/ajax_form.php",
         data: $('form.alerts-form').serialize(),
         success: function(msg){
-            $("#message").html('<div class="alert alert-info">'+msg+'</div>');
-            $("#create-alert").modal('hide');
             if(msg.indexOf("ERROR:") <= -1) {
+                $("#message").html('<div class="alert alert-info">'+msg+'</div>');
+                $("#create-alert").modal('hide');
                 $('#response').data('tagmanager').empty();
                 setTimeout(function() {
                     location.reload(1);
                 }, 1000);
+            } else {
+                $('#ajax_response').html('<div class="alert alert-danger alert-dismissible"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+msg+'</div>');
             }
         },
         error: function(){
-            $("#message").html('<div class="alert alert-info">An error occurred creating this alert.</div>');
-            $("#create-alert").modal('hide');
+            $("#ajax_response").html('<div class="alert alert-info">An error occurred creating this alert.</div>');
         }
     });
 });
 
+$( "#suggest, #value" ).blur(function() {
+    var $this = $(this);
+    var suggest = $('#suggest').val();
+    var value = $('#value').val();
+    if (suggest == "") {
+        $("#next-step-and").html("");
+        $("#value").closest('.form-group').removeClass('has-error');
+        $("#suggest").closest('.form-group').addClass('has-error');
+    } else if (value == "") {
+        $("#next-step-and").html("");
+        $("#value").closest('.form-group').addClass('has-error');
+        $("#suggest").closest('.form-group').removeClass('has-error');
+    } else {
+        $("#suggest").closest('.form-group').removeClass('has-error');
+        $("#value").closest('.form-group').removeClass('has-error');
+        $("#next-step-and").html('<i class="fa fa-long-arrow-left fa-col-danger"></i> Click AND / OR');
+    }
+});
+
 </script>
 
 <?php
diff --git a/html/includes/modal/new_device_group.inc.php b/html/includes/modal/new_device_group.inc.php
index 8b9490bc8..aa5717b28 100644
--- a/html/includes/modal/new_device_group.inc.php
+++ b/html/includes/modal/new_device_group.inc.php
@@ -24,16 +24,21 @@ if(is_admin() !== false) {
         </div>
         <div class="modal-body">
             <form method="post" role="form" id="group" class="form-horizontal group-form">
+        <div class="form-group">
+            <div class="col-sm-12">
+                <span id="ajax_response"></span>
+            </div>
+        </div>
         <div class='form-group'>
             <label for='name' class='col-sm-3 control-label'>Name: </label>
             <div class='col-sm-9'>
-                <input type='text' id='name' name='name' class='form-control' maxlength='200'>
+                <input type='text' id='name' name='name' class='form-control has-feedback' maxlength='200'>
             </div>
         </div>
         <div class='form-group'>
             <label for='desc' class='col-sm-3 control-label'>Description: </label>
             <div class='col-sm-9'>
-                <input type='text' id='desc' name='desc' class='form-control' maxlength='200'>
+                <input type='text' id='desc' name='desc' class='form-control has-feedback' maxlength='200'>
             </div>
         </div>
             <input type="hidden" name="group_id" id="group_id" value="">
@@ -41,7 +46,7 @@ if(is_admin() !== false) {
         <div class="form-group">
                 <label for='pattern' class='col-sm-3 control-label'>Pattern: </label>
                 <div class="col-sm-5">
-                        <input type='text' id='suggest' name='pattern' class='form-control' placeholder='I.e: devices.status'/>
+                        <input type='text' id='suggest' name='pattern' class='form-control has-feedback' placeholder='I.e: devices.status'/>
                 </div>
         </div>
         <div class="form-group">
@@ -52,7 +57,7 @@ if(is_admin() !== false) {
         <div class="form-group">
                 <label for='condition' class='col-sm-3 control-label'>Condition: </label>
                 <div class="col-sm-5">
-                        <select id='condition' name='condition' placeholder='Condition' class='form-control'>
+                        <select id='condition' name='condition' placeholder='Condition' class='form-control has-feedback'>
                                 <option value='='>Equals</option>
                                 <option value='!='>Not Equals</option>
 				<option value='~'>Like</option>
@@ -67,14 +72,15 @@ if(is_admin() !== false) {
         <div class="form-group">
                 <label for='value' class='col-sm-3 control-label'>Value: </label>
                 <div class="col-sm-5">
-                        <input type='text' id='value' name='value' class='form-control'/>
+                        <input type='text' id='value' name='value' class='form-control has-feedback'/>
                 </div>
         </div>
         <div class="form-group">
                 <label for='group-glue' class='col-sm-3 control-label'>Connection: </label>
                 <div class="col-sm-5">
-                        <button class="btn btn-default btn-sm" type="submit" name="group-glue" value="&&" id="and" name="and">And</button>
-                        <button class="btn btn-default btn-sm" type="submit" name="group-glue" value="||" id="or" name="or">Or</button>
+                        <button class="btn btn-warning btn-sm" type="submit" name="group-glue" value="&&" id="and" name="and">And</button>
+                        <button class="btn btn-warning btn-sm" type="submit" name="group-glue" value="||" id="or" name="or">Or</button>
+                        <span id="next-step-and"></span>
                 </div>
         </div>
             <div class="row">
@@ -84,7 +90,7 @@ if(is_admin() !== false) {
             </div>
         <div class="form-group">
                 <div class="col-sm-offset-3 col-sm-3">
-                        <button class="btn btn-default btn-sm" type="submit" name="group-submit" id="group-submit" value="save">Save Group</button>
+                        <button class="btn btn-success btn-sm" type="submit" name="group-submit" id="group-submit" value="save">Save Group</button>
                 </div>
         </div>
 </form>
@@ -164,6 +170,7 @@ $('#suggest').typeahead({
 
 $('#and, #or').click('', function(e) {
     e.preventDefault();
+    $("#next-step-and").html("");
     var entity = $('#suggest').val();
     var condition = $('#condition').val();
     var value = $('#value').val();
@@ -188,13 +195,15 @@ $('#group-submit').click('', function(e) {
         url: "/ajax_form.php",
         data: $('form.group-form').serialize(),
         success: function(msg){
-            $("#message").html('<div class="alert alert-info">'+msg+'</div>');
-            $("#create-group").modal('hide');
             if(msg.indexOf("ERROR:") <= -1) {
+                $("#message").html('<div class="alert alert-info">'+msg+'</div>');
+                $("#create-group").modal('hide');
                 $('#response').data('tagmanager').empty();
                 setTimeout(function() {
                     location.reload(1);
                 }, 1000);
+            } else {
+                $('#ajax_response').html('<div class="alert alert-danger alert-dismissible"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+msg+'</div>');
             }
         },
         error: function(){
@@ -204,6 +213,34 @@ $('#group-submit').click('', function(e) {
     });
 });
 
+$( "#name, #suggest, #value" ).blur(function() {
+    var $this = $(this);
+    var name = $('#name').val();
+    var suggest = $('#suggest').val();
+    var value = $('#value').val();
+    if (name == "") {
+        $("#next-step-and").html("");
+        $("#suggest").closest('.form-group').removeClass('has-error');
+        $("#value").closest('.form-group').removeClass('has-error');
+        $("#name").closest('.form-group').addClass('has-error');
+    } else if (suggest == "") {
+        $("#next-step-and").html("");
+        $("#name").closest('.form-group').removeClass('has-error');
+        $("#value").closest('.form-group').removeClass('has-error');
+        $("#suggest").closest('.form-group').addClass('has-error');
+    } else if (value == "") {
+        $("#next-step-and").html("");
+        $("#name").closest('.form-group').removeClass('has-error');
+        $("#suggest").closest('.form-group').removeClass('has-error');
+        $("#value").closest('.form-group').addClass('has-error');
+    } else {
+        $("#name").closest('.form-group').removeClass('has-error');
+        $("#suggest").closest('.form-group').removeClass('has-error');
+        $("#value").closest('.form-group').removeClass('has-error');
+        $("#next-step-and").html('<i class="fa fa-long-arrow-left fa-col-danger"></i> Click AND / OR');
+    }
+});
+
 </script>
 
 <?php