diff --git a/inc/header.inc.php b/inc/header.inc.php
index ad2f9913..19fc20ef 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -57,6 +57,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
     <?php } else { ?>
     <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.php?v=<?php echo $hesk_settings['hesk_version']; ?>" type="text/css" rel="stylesheet" />
     <?php } ?>
+    <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
 	<script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
@@ -64,6 +65,9 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
 	<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/modsForHesk-javascript.js"></script>
     <script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-datepicker.js"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-fontawesome-4.3.0.js"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
 
     <?php
 
diff --git a/index.php b/index.php
index d73403d1..7e91e765 100644
--- a/index.php
+++ b/index.php
@@ -1089,11 +1089,20 @@ function print_start()
                         ?>
                         <div class="form-group">
                             <label for="emailAddress"><?php echo $hesklang['email']; ?>:</label>
+                            <?php
+                            $my_email = '';
+                            $do_remember = '';
+                            if (isset($_COOKIE['hesk_myemail']))
+                            {
+                                $my_email = $_COOKIE['hesk_myemail'];
+                                $do_remember = 'checked';
+                            }
+                            ?>
                             <input type="text" class="form-control" name="e" id="emailAddress" size="35" value="<?php echo $my_email; ?>" placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"/>
                         </div>
                         <div class="checkbox">
                             <label for="r">
-                                <input type="checkbox" name="r" value="Y" /> <?php echo $hesklang['rem_email']; ?>
+                                <input type="checkbox" name="r" value="Y" <?php echo $do_remember; ?>> <?php echo $hesklang['rem_email']; ?>
                             </label>
                         </div>
                         <?php