diff --git a/admin/change_status.php b/admin/change_status.php
index 4598eb3f..3b2dd317 100644
--- a/admin/change_status.php
+++ b/admin/change_status.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.5 from 5th August 2014
+*  Version: 2.6.0 beta 1 from 30th December 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -84,20 +84,47 @@ if ($statusRow['IsClosed']) // Closed
     {
     	$locked = 1;
     }
+
+    // Notify customer of closed ticket?
+    if ($hesk_settings['notify_closed'])
+    {
+        // Get ticket info
+        $result = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+        if (hesk_dbNumRows($result) != 1)
+        {
+            hesk_error($hesklang['ticket_not_found']);
+        }
+        $ticket = hesk_dbFetchAssoc($result);
+        $ticket['dt'] = hesk_date($ticket['dt'], true);
+        $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
+
+        // Notify customer
+        require(HESK_PATH . 'inc/email_functions.inc.php');
+        hesk_notifyCustomer('ticket_closed');
+    }
+
+    // Log who marked the ticket resolved
+    $closedby_sql = ' , `closedat`=NOW(), `closedby`='.intval($_SESSION['id']).' ';
 }
 elseif ($statusRow['ID'] != 0) //Ticket is still open, but not new
 {
 	$action = sprintf($hesklang['tsst'],$status_options[$status]);
     $revision = sprintf($hesklang['thist9'],hesk_date(),$status_options[$status],$_SESSION['name'].' ('.$_SESSION['user'].')');
+
+    // Ticket is not resolved
+    $closedby_sql = ' , `closedat`=NULL, `closedby`=NULL ';
 }
 else // Ticket is marked as "NEW"
 {
 	$action = $hesklang['ticket_been'] . ' ' . $hesklang['opened'];
     $revision = sprintf($hesklang['thist4'],hesk_date(),$_SESSION['name'].' ('.$_SESSION['user'].')');
+
+    // Ticket is not resolved
+    $closedby_sql = ' , `closedat`=NULL, `closedby`=NULL ';
 }
 
 
-hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `status`='{$status}', `locked`='{$locked}', `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `status`='{$status}', `locked`='{$locked}' $closedby_sql , `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
 
 if (hesk_dbAffectedRows() != 1)
 {