diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index 4310f94d..8b229636 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -63,7 +63,7 @@ if ( empty($_POST) && ! empty($_SERVER['CONTENT_LENGTH']) )
 $hesk_error_buffer = array();
 
 $tmpvar['name']	    = hesk_input( hesk_POST('name') ) or $hesk_error_buffer['name']=$hesklang['enter_your_name'];
-$tmpvar['email']	= hesk_validateEmail( hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer['email']=$hesklang['enter_valid_email'];
+$tmpvar['email']	= hesk_POST('email');
 $tmpvar['category'] = intval( hesk_POST('category') ) or $hesk_error_buffer['category']=$hesklang['sel_app_cat'];
 $tmpvar['priority'] = intval( hesk_POST('priority') );
 
@@ -178,7 +178,7 @@ elseif (hesk_checkPermission('can_assign_self',0) && hesk_okCategory($tmpvar['ca
 }
 
 // Notify customer of the ticket?
-$notify = ! empty($_POST['notify']) ? 1 : 0;
+$notify = (!empty($_POST['notify']) && !empty($tmpvar['email']) ) ? 1 : 0;
 
 // Show ticket after submission?
 $show = ! empty($_POST['show']) ? 1 : 0;
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 622d7814..478709e3 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1265,8 +1265,10 @@ function hesk_printReplyForm() {
 	                </select></div><br />
 	                <label><input type="checkbox" name="signature" value="1" checked="checked" /> <?php echo $hesklang['attach_sign']; ?></label>
 	                (<a href="profile.php"><?php echo $hesklang['profile_settings']; ?></a>)<br />
-                    <label><input type="checkbox" name="no_notify" value="1" /> <?php echo $hesklang['dsen']; ?></label><br/><br/>
-                    
+                    <label><input type="checkbox" name="no_notify" value="1" <?php if (empty($ticket['email'])) { echo 'checked="checked" disabled'; } ?>> <?php echo $hesklang['dsen']; ?></label><br/><br/>
+                    <?php if (empty($ticket['email'])) {
+                        echo '<input type="hidden" name="no_notify" value="1">';
+                    } ?>
                     <input type="hidden" name="orig_id" value="<?php echo $ticket['id']; ?>" />
                     <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
                     <input class="btn btn-default" type="submit" value="<?php echo $hesklang['submit_reply']; ?>" />
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 8fdc44eb..0c140113 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -119,8 +119,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <input type="text" class="form-control" name="name" size="40" maxlength="30" value="<?php if (isset($_SESSION['as_name'])) {echo stripslashes(hesk_input($_SESSION['as_name']));} ?>"   placeholder="<?php echo $hesklang['name']; ?>"/>
                     </div>
                 </div>
-                <?php if (in_array('email',$_SESSION['iserror'])) {echo '<div class="form-group has-error">';} elseif (in_array('email',$_SESSION['isnotice'])) {echo '<div class="form-group has-warning">';} else {echo '<div class="form-group">';} ?>
-                    <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?>: <font class="important">*</font></label>
+                <div class="form-group">
+                    <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?>: </label>
                     <div class="col-sm-9">
                         <input type="text" class="form-control" name="email" size="40" maxlength="255" value="<?php if (isset($_SESSION['as_email'])) {echo stripslashes(hesk_input($_SESSION['as_email']));} ?>" <?php if($hesk_settings['detect_typos']) { echo ' onblur="Javascript:hesk_suggestEmail(1)"'; } ?> placeholder="<?php echo $hesklang['email']; ?>"/>
                     </div>