diff --git a/admin/admin_main.php b/admin/admin_main.php
index 111ed08a..c6bb29ce 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 3b317f21..71ce4992 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index d05a2a1b..51bc8e27 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index cd9e186c..40f4a87d 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -35,6 +35,12 @@
 define('IN_SCRIPT',1);
 define('HESK_PATH','../');
 
+// Make sure OPcache is reset when modifying settings
+if ( function_exists('opcache_reset') )
+{
+	opcache_reset();
+}
+
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'modsForHesk_settings.inc.php');
@@ -108,7 +114,7 @@ else
 /* --> Helpdesk settings */
 $set['hesk_title']		= hesk_input( hesk_POST('s_hesk_title'), $hesklang['err_htitle']);
 $set['hesk_title']		= str_replace('\\&quot;','&quot;',$set['hesk_title']);
-$set['hesk_url']		= hesk_input( hesk_POST('s_hesk_url'), $hesklang['err_hurl']);
+$set['hesk_url']		= rtrim( hesk_input( hesk_POST('s_hesk_url'), $hesklang['err_hurl']), '/');
 
 // ---> check admin folder
 $set['admin_dir'] = isset($_POST['s_admin_dir']) && ! is_array($_POST['s_admin_dir']) ? preg_replace('/[^a-zA-Z0-9_-]/', '', $_POST['s_admin_dir']) : 'admin';
@@ -487,6 +493,19 @@ for ($i=1;$i<=20;$i++)
         {
         	$set['custom_fields'][$this_field]['type'] = 'text';
         }
+
+		// Try to detect if field type changed to anything except "select"
+		if ($set['custom_fields'][$this_field]['type'] != 'select')
+		{
+			// If type is "radio" or "checkbox" remove "please select", keep other options
+			$set['custom_fields'][$this_field]['value'] = str_replace('{HESK_SELECT}', '', $set['custom_fields'][$this_field]['value']);
+
+			// Field type changed to "text" or "textarea", clear default value if it contains "#HESK#" separator
+			if ( in_array($set['custom_fields'][$this_field]['type'], array('text','textarea')) && ! in_array($hesk_settings['custom_fields'][$this_field]['type'], array('text','textarea')) && strpos($set['custom_fields'][$this_field]['value'], '#HESK#') !== false )
+			{
+				$set['custom_fields'][$this_field]['value'] = '';
+			}
+		}
 	}
 	else
 	{
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index 33f675ff..71f24e8e 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 35aca09b..ef9f91f8 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index b9517c0f..a5f3c9a4 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/banned_ips.php b/admin/banned_ips.php
index 71dcba3e..74d2c917 100644
--- a/admin/banned_ips.php
+++ b/admin/banned_ips.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/change_status.php b/admin/change_status.php
index d645859e..b0dcc389 100644
--- a/admin/change_status.php
+++ b/admin/change_status.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/delete_tickets.php b/admin/delete_tickets.php
index c65be8a3..98d59b63 100644
--- a/admin/delete_tickets.php
+++ b/admin/delete_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/edit_note.php b/admin/edit_note.php
index 3356ed62..39570221 100644
--- a/admin/edit_note.php
+++ b/admin/edit_note.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/edit_post.php b/admin/edit_post.php
index 2a399819..1500c46c 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/export.php b/admin/export.php
index 5fd3027d..ca70f3a2 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/find_tickets.php b/admin/find_tickets.php
index 7b0f9626..855e6687 100644
--- a/admin/find_tickets.php
+++ b/admin/find_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/index.php b/admin/index.php
index 4b0ba816..17ebb7ba 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index fb55f26b..261f066b 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/lock.php b/admin/lock.php
index e214ee02..4420730b 100644
--- a/admin/lock.php
+++ b/admin/lock.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/mail.php b/admin/mail.php
index 4bb4fcc4..2a71c876 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 19c38d66..b4aaf195 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 12c6f337..5854fda8 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index efe6e526..39c3805e 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php
index 55f0b773..114bf9a0 100644
--- a/admin/manage_permission_templates.php
+++ b/admin/manage_permission_templates.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 8ff7d655..5eba1ae9 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_users.php b/admin/manage_users.php
index 0deacacf..142fdf07 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 6b266304..2de97f82 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/options.php b/admin/options.php
index 9b2abe6b..9c4f155d 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/password.php b/admin/password.php
index 4811a896..509df002 100644
--- a/admin/password.php
+++ b/admin/password.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -238,6 +238,9 @@ elseif ( isset($_GET['h']) )
 			// Expire all verification hashes for this user
 			hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."reset_password` WHERE `user`=".intval($row['user']));
 
+			// Load additional required functions
+			require(HESK_PATH . 'inc/admin_functions.inc.php');
+
 			// Get user details
 			$res = hesk_dbQuery('SELECT * FROM `'.$hesk_settings['db_pfix']."users` WHERE `id`=".intval($row['user'])." LIMIT 1");
 			$row = hesk_dbFetchAssoc($res);
@@ -245,6 +248,11 @@ elseif ( isset($_GET['h']) )
 			{
 				$_SESSION[$k]=$v;
 			}
+
+			// Set a tag that will be used to expire sessions after username or password change
+			$_SESSION['session_verify'] = hesk_activeSessionCreateTag($_SESSION['user'], $_SESSION['pass']);
+
+			// We don't need the password hash anymore
 			unset($_SESSION['pass']);
 
 			// Clean brute force attempts
diff --git a/admin/profile.php b/admin/profile.php
index 282766e3..304d34b2 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/reports.php b/admin/reports.php
index 4137c9a4..69ae1bf2 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 060b50ca..988dd776 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index dd140dc8..f770ba92 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/change_status.php b/change_status.php
index 3b3bfcba..f6c37b09 100644
--- a/change_status.php
+++ b/change_status.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/download_attachment.php b/download_attachment.php
index dab63c42..ca4d63b8 100755
--- a/download_attachment.php
+++ b/download_attachment.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/hesk_javascript.js b/hesk_javascript.js
index 17d019c4..54104370 100644
--- a/hesk_javascript.js
+++ b/hesk_javascript.js
@@ -1,6 +1,6 @@
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
index 03224155..7e7682bd 100644
--- a/inc/admin_functions.inc.php
+++ b/inc/admin_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -758,13 +758,13 @@ function hesk_checkPermission($feature,$showerror=1) {
 	global $hesklang;
 
     /* Admins have full access to all features */
-    if ($_SESSION['isadmin'])
+	if (isset($_SESSION['isadmin']) && $_SESSION['isadmin'])
     {
         return true;
     }
 
     /* Check other staff for permissions */
-    if (strpos($_SESSION['heskprivileges'], $feature) === false)
+	if (isset($_SESSION['heskprivileges']) && strpos($_SESSION['heskprivileges'], $feature) === false)
     {
     	if ($showerror)
         {
diff --git a/inc/attachments.inc.php b/inc/attachments.inc.php
index 8a56797a..1fbc89b0 100644
--- a/inc/attachments.inc.php
+++ b/inc/attachments.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 8fe783c0..c0bc5fb4 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -37,6 +37,12 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 #error_reporting(E_ALL);
 
+// Set correct Content-Type header
+if ( ! defined('NO_HTTP_HEADER') )
+{
+	header('Content-Type: text/html; charset=utf-8');
+}
+
 // Set backslash options
 if (get_magic_quotes_gpc())
 {
diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php
index fc335c19..6b3ad2ba 100644
--- a/inc/email_functions.inc.php
+++ b/inc/email_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -104,7 +104,7 @@ function hesk_notifyCustomer($email_template = 'new_ticket')
 
     $changedLanguage = false;
     //Set the user's language according to the ticket.
-    if ($ticket['language'] !== NULL)
+    if (isset($ticket['language']) && $ticket['language'] !== NULL)
     {
         hesk_setLanguage($ticket['language']);
         $changedLanguage = true;
@@ -135,10 +135,7 @@ function hesk_notifyCustomer($email_template = 'new_ticket')
 	hesk_mail($ticket['email'], $subject, $message, $htmlMessage, $ccEmails, $bccEmails, $hasMessage);
 
     // Reset the language if it was changed
-    if ($changedLanguage)
-    {
-        hesk_resetLanguage();
-    }
+    hesk_resetLanguage();
 
     return true;
 
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 14a67eb0..19be86aa 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 11341279..ff51e833 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index 683f66f8..9410ac82 100644
--- a/inc/knowledgebase_functions.inc.php
+++ b/inc/knowledgebase_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/pipe_functions.inc.php b/inc/pipe_functions.inc.php
index 1c37de54..519f5354 100755
--- a/inc/pipe_functions.inc.php
+++ b/inc/pipe_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/posting_functions.inc.php b/inc/posting_functions.inc.php
index 6f1a2d09..6f6be248 100644
--- a/inc/posting_functions.inc.php
+++ b/inc/posting_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/print_tickets.inc.php b/inc/print_tickets.inc.php
index fc77e679..98cc0245 100644
--- a/inc/print_tickets.inc.php
+++ b/inc/print_tickets.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
index 92aeeb20..0ed6f595 100644
--- a/inc/profile_functions.inc.php
+++ b/inc/profile_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/recaptcha/recaptchalib_v2.php b/inc/recaptcha/recaptchalib_v2.php
index 9b035ada..4fdae35f 100755
--- a/inc/recaptcha/recaptchalib_v2.php
+++ b/inc/recaptcha/recaptchalib_v2.php
@@ -52,7 +52,7 @@ class ReCaptcha
      *
      * @param string $secret shared secret between site and ReCAPTCHA server.
      */
-    function ReCaptcha($secret)
+    function __construct($secret)
     {
         if ($secret == null || $secret == "") {
             die("To use reCAPTCHA you must get an API key from <a href='"
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index a44261c0..ffb91d9e 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index e0b35307..d9426e70 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.4 from 22nd June 2015
+ *  Version: 2.6.5 from 28th August 2015
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/status_functions.inc.php b/inc/status_functions.inc.php
index ce451b42..e95bde6f 100644
--- a/inc/status_functions.inc.php
+++ b/inc/status_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.4 from 22nd June 2015
+ *  Version: 2.6.5 from 28th August 2015
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index 4c191dee..77f4252b 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/index.php b/index.php
index b9344982..17ca937c 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/install/install.php b/install/install.php
index d84d00c7..439916e7 100644
--- a/install/install.php
+++ b/install/install.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 5a2dcb06..da8d961a 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -36,7 +36,7 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
-define('HESK_NEW_VERSION','2.6.4');
+define('HESK_NEW_VERSION','2.6.5');
 define('MODS_FOR_HESK_NEW_VERSION','2.4.1');
 define('REQUIRE_PHP_VERSION','5.0.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
diff --git a/knowledgebase.php b/knowledgebase.php
index 7fd2d310..4cbc3afd 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/print.php b/print.php
index f3b43b12..10e690bf 100644
--- a/print.php
+++ b/print.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/reply_ticket.php b/reply_ticket.php
index 435a345b..fe82329c 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/submit_ticket.php b/submit_ticket.php
index 5eedc331..9eb0abbe 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/suggest_articles.php b/suggest_articles.php
index e9d49710..df3447bc 100644
--- a/suggest_articles.php
+++ b/suggest_articles.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/suggest_email.php b/suggest_email.php
index a683ae01..76a0aec0 100644
--- a/suggest_email.php
+++ b/suggest_email.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/ticket.php b/ticket.php
index 78d30d0b..1d66e1bc 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.4 from 22nd June 2015
+*  Version: 2.6.5 from 28th August 2015
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************