diff --git a/lib/EmailTemplates.php b/lib/EmailTemplates.php
index 338fe4458..bc5e19fd1 100755
--- a/lib/EmailTemplates.php
+++ b/lib/EmailTemplates.php
@@ -251,6 +251,7 @@ public function replaceVariables($text)
         $email    = $_SESSION['CATS']->getEmail();
         $siteName = $_SESSION['CATS']->getSiteName();
         $fullName = $_SESSION['CATS']->getFullName();
+        $emailSignature = $this->getEmailSignature();
 
         if ($_SESSION['CATS']->isDateDMY())
         {
@@ -275,7 +276,8 @@ public function replaceVariables($text)
             '%DATETIME%',
             '%SITENAME%',
             '%USERFULLNAME%',
-            '%USERMAIL%'
+            '%USERMAIL%',
+            '%USEREMAILSIGNATURE%'
         );
 
         if ($isLoggedIn)
@@ -284,7 +286,8 @@ public function replaceVariables($text)
                 DateUtility::getAdjustedDate($dateFormat . ' g:i A'),
                 $siteName,
                 $fullName,
-                '<a href="mailto:'. $email .'">'. $email .'</a>'
+                '<a href="mailto:'. $email .'">'. $email .'</a>',
+                $emailSignature
             );
         }
         else
@@ -391,7 +394,40 @@ public function getAll()
 
         return $this->_db->getAllAssoc($sql);
     }
-    
+
+    public function getEmailSignature(){
+        $sql = sprintf(
+            "SELECT
+                settings.value AS value
+            FROM
+                settings
+            WHERE
+                settings.site_id = %s
+            AND
+                settings.settings_type = %s
+            AND
+                settings.setting = %s",
+            $this->_siteID,
+            SETTINGS_MAILER,
+            $this->_db->makeQueryString("emailSignature_".$_SESSION['CATS']->getUserID())
+        );
+        $rs = $this->_db->getAllAssoc($sql);
+        if(empty($rs) || !$rs){
+            return "";
+        }
+        return $rs[0]['value'];
+    }
+
+    public function saveEmailSignature($signature){
+        if(strlen($signature) > 254){
+            return -1;
+        } else {
+            $mailerSettings = new MailerSettings($this->_siteID);
+            $mailerSettings->set("emailSignature_" . $_SESSION['CATS']->getUserID(), $signature);
+            return 0;
+        }
+    }
+
     public function getAllCustom()
     {
         $sql = sprintf(
diff --git a/lib/Mailer.php b/lib/Mailer.php
index 2921294eb..6ce61b442 100755
--- a/lib/Mailer.php
+++ b/lib/Mailer.php
@@ -478,7 +478,7 @@ public function set($setting, $value)
             AND
                 site_id = %s
             AND
-                settings_type",
+                settings_type = %s",
             $this->_db->makeQueryStringOrNULL($setting),
             $this->_siteID,
             SETTINGS_MAILER
diff --git a/modules/settings/EmailSignature.tpl b/modules/settings/EmailSignature.tpl
new file mode 100644
index 000000000..1e630e078
--- /dev/null
+++ b/modules/settings/EmailSignature.tpl
@@ -0,0 +1,82 @@
+<?php /* $Id: EmailSignature.tpl $ */ ?>
+<?php TemplateUtility::printHeader('Settings', array('modules/settings/validator.js', 'js/sorttable.js', 'ckeditor/ckeditor.js')); ?>
+<?php TemplateUtility::printHeaderBlock(); ?>
+<?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
+<div id="main">
+    <?php TemplateUtility::printQuickSearch(); ?>
+
+    <div id="contents">
+        <table>
+            <tr>
+                <td width="3%">
+                    <img src="images/settings.gif" width="24" height="24" border="0" alt="Settings" style="margin-top: 3px;" />&nbsp;
+                </td>
+                <td><h2>Settings: E-Mail Signature</h2></td>
+            </tr>
+        </table>
+
+        <p class="note">My E-Mail Signature</p>
+
+        <form name="changeEmailSignatureForm" id="changeEmailSignatureForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=settings&amp;a=myProfile&amp;s=emailSignature" method="post">
+            <input type="hidden" name="postback" id="postback" value="postback" />
+
+            <?php if ($this->isDemoUser): ?>
+            Note that as a demo user, you do not have privileges to modify any settings.
+            <br /><br />
+            <?php endif; ?>
+
+            <table class="searchTable">
+                <tr>
+                    <td colspan="4">
+                        <span class="bold">Change Signature</span>
+                        <br />
+                        <br />
+                        <span id='passwordErrorMessage' style="font:smaller; color: red">
+                                <?php if (isset($this->errorMessage)): ?>
+                            <?php $this->_($this->errorMessage); ?>
+                            <?php endif; ?>
+                            </span>
+                    </td>
+                </tr>
+
+
+                <tr>
+                    <td>
+                        <label id="signatureLabel" for="signature">Current Signature:</label>&nbsp;
+                    </td>
+                    <td>
+                        <textarea rows=7 cols=60 class="inputbox" id="signature" name="signature"><?php echo $this->emailSignature; ?></textarea>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">
+                        <br />
+                        <input type="submit" class="button" id="changeSignature" name="action" value="Save" />
+                        <input type="button" name="back" class = "button" value="Back" onclick="document.location.href='<?php echo(CATSUtility::getIndexName()); ?>?m=settings';" />
+                    </td>
+                </tr>
+            </table>
+        </form>
+    </div>
+</div>
+<script type="text/javascript">
+    CKEDITOR.replace( 'signature' );
+    CKEDITOR.on('instanceReady', function(ev)
+    {
+        var tags = ['p', 'ol', 'ul', 'li']; // etc.
+
+        for (var key in tags) {
+            ev.editor.dataProcessor.writer.setRules(
+                tags[key],
+                {
+                    indent : false,
+                    breakBeforeOpen : false,
+                    breakAfterOpen : false,
+                    breakBeforeClose : false,
+                    breakAfterClose : false,
+                });
+        }
+    });
+</script>
+<?php TemplateUtility::printFooter(); ?>
diff --git a/modules/settings/EmailTemplates.tpl b/modules/settings/EmailTemplates.tpl
index cf7577c8b..2cf387048 100755
--- a/modules/settings/EmailTemplates.tpl
+++ b/modules/settings/EmailTemplates.tpl
@@ -157,6 +157,7 @@
                                                             <?php generateInsertAtCursorLink($data, 'Site Name', '%SITENAME%'); ?>
                                                             <?php generateInsertAtCursorLink($data, 'Recruiter/Current User Name', '%USERFULLNAME%'); ?>
                                                             <?php generateInsertAtCursorLink($data, 'Recruiter/Current User E-Mail Link', '%USERMAIL%'); ?>
+                                                            <?php generateInsertAtCursorLink($data, 'Current User E-Mail Signature', '%USEREMAILSIGNATURE%'); ?>
                                                         <?php endif; ?>
 
                                                         <?php /* Template specific vars */ ?>
diff --git a/modules/settings/MyProfile.tpl b/modules/settings/MyProfile.tpl
index cb1771d0d..04872aa83 100755
--- a/modules/settings/MyProfile.tpl
+++ b/modules/settings/MyProfile.tpl
@@ -46,6 +46,16 @@
                                     Change your CATS login password.
                                 </td>
                             </tr>
+                            <tr>
+                                <td width="230">
+                                    <a href="<?php echo(CATSUtility::getIndexName()); ?>?m=settings&amp;a=myProfile&amp;s=emailSignature">
+                                        <img src="images/bullet_black.gif" alt="" border="0" />Change E-mail Signature
+                                    </a>
+                                </td>
+                                <td>
+                                    Change the signature that can be used with e-mail templates sent from your account.
+                                </td>
+                            </tr>
                             <!--<tr>
                                 <td>
                                     <a href="<?php echo(CATSUtility::getIndexName()); ?>?m=settings&amp;a=myProfile&amp;s=notificationOptions">
diff --git a/modules/settings/SettingsUI.php b/modules/settings/SettingsUI.php
index c5475d2ea..d1d30cd5b 100755
--- a/modules/settings/SettingsUI.php
+++ b/modules/settings/SettingsUI.php
@@ -953,6 +953,24 @@ private function myProfile()
                     $templateFile = './modules/settings/ChangePassword.tpl';
                     break;
 
+                case 'emailSignature':
+                    $emailTemplates = new EmailTemplates($this->_siteID);
+                    $emailSignature = $_POST['signature'];
+                    if($this->isPostBack()){
+                        $result = $emailTemplates->saveEmailSignature($emailSignature);
+                        if($result == -1){
+                            $this->_template->assign('errorMessage', "The signature text is too long.");
+
+                        } else {
+                            CATSUtility::transferRelativeURI("m=settings&a=myProfile");
+                        }
+                    } else {
+                        $emailSignature = $emailTemplates->getEmailSignature();
+                    }
+                    $this->_template->assign('emailSignature', $emailSignature);
+                    $templateFile = './modules/settings/EmailSignature.tpl';
+                    break;
+
                 default:
                     $templateFile = './modules/settings/MyProfile.tpl';
                     break;