diff --git a/.gitignore b/.gitignore
index 32828f4a..bdfa288b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ admin/archive.php
 admin/assign_owner.php
 admin/generate_spam_question.php
 admin/move_category.php
-admin/options.php
 admin/priority.php
 admin/test_connection.php
 attachments/index.htm
diff --git a/admin/options.php b/admin/options.php
new file mode 100644
index 00000000..ca5d37f8
--- /dev/null
+++ b/admin/options.php
@@ -0,0 +1,329 @@
+<?php
+/*******************************************************************************
+*  Title: Help Desk Software HESK
+*  Version: 2.5.3 from 16th March 2014
+*  Author: Klemen Stirn
+*  Website: http://www.hesk.com
+********************************************************************************
+*  COPYRIGHT AND TRADEMARK NOTICE
+*  Copyright 2005-2014 Klemen Stirn. All Rights Reserved.
+*  HESK is a registered trademark of Klemen Stirn.
+
+*  The HESK may be used and modified free of charge by anyone
+*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
+*  By using this code you agree to indemnify Klemen Stirn from any
+*  liability that might arise from it's use.
+
+*  Selling the code for this program, in part or full, without prior
+*  written consent is expressly forbidden.
+
+*  Using this code, in part or full, to create derivate work,
+*  new scripts or products is expressly forbidden. Obtain permission
+*  before redistributing this software over the Internet or in
+*  any other medium. In all cases copyright and header must remain intact.
+*  This Copyright is in full effect in any country that has International
+*  Trade Agreements with the United States of America or
+*  with the European Union.
+
+*  Removing any of the copyright notices without purchasing a license
+*  is expressly forbidden. To remove HESK copyright notice you must purchase
+*  a license for this script. For more information on how to obtain
+*  a license please visit the page below:
+*  https://www.hesk.com/buy.php
+*******************************************************************************/
+
+define('IN_SCRIPT',1);
+define('HESK_PATH','../');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+
+$id     = hesk_input( hesk_GET('i') );
+$query  = hesk_input( hesk_utf8_urldecode( hesk_GET('q') ) );
+$type   = hesk_input( hesk_GET('t', 'text') );
+$maxlen = intval( hesk_GET('m', 255) );
+$query  = stripslashes($query);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML; 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+<title><?php echo $hesklang['opt']; ?></title>
+<meta http-equiv="Content-Type" content="text/html;charset=<?php echo $hesklang['ENCODING']; ?>" />
+<style type="text/css">
+body
+{
+        margin:5px 5px;
+        padding:0;
+        background:#fff;
+        color: black;
+        font : 68.8%/1.5 Verdana, Geneva, Arial, Helvetica, sans-serif;
+        text-align:left;
+}
+
+p
+{
+        color : black;
+        font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+        font-size: 1.0em;
+}
+h3
+{
+        color : #AF0000;
+        font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+        font-weight: bold;
+        font-size: 1.0em;
+        text-align:center;
+}
+.title
+{
+        color : black;
+        font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
+        font-weight: bold;
+        font-size: 1.0em;
+}
+.wrong   {color : red;}
+.correct {color : green;}
+</style>
+</head>
+<body>
+
+<h3><?php echo $hesklang['opt']; ?></h3>
+
+<p><i><?php echo $hesklang['ns']; ?></i></p>
+
+<?php
+
+switch ($type)
+{
+	case 'text':
+    	echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = document.getElementById(\'o2\').value;
+            window.opener.document.getElementById(\'s_'.$id.'_maxlen\').value = document.getElementById(\'o1\').value;
+            window.close();
+        }
+        </script>
+		<table border="0">
+        <tr>
+        <td>'.$hesklang['custom_l'].':<td>
+        <td><input type="text" name="o1" id="o1" value="'.$maxlen.'" size="30" /></td>
+        </tr>
+        <tr>
+        <td>'.$hesklang['defw'].':<td>
+        <td><input type="text" name="o2" id="o2" value="'.$query.'" size="30" /></td>
+        </tr>
+        </table>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+    	break;
+    case 'textarea':
+    	if (strpos($query,'#') !== false)
+        {
+        	list($rows,$cols)=explode('#',$query);
+        }
+        else
+        {
+        	$rows = '';
+            $cols = '';
+        }
+    	echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = document.getElementById(\'o1\').value + "#" + document.getElementById(\'o2\').value;
+            window.close();
+        }
+        </script>
+		<table border="0">
+        <tr>
+        <td>'.$hesklang['rows'].':<td>
+        <td><input type="text" name="o1" id="o1" value="'.$rows.'" size="5" /></td>
+        </tr>
+        <tr>
+        <td>'.$hesklang['cols'].':<td>
+        <td><input type="text" name="o2" id="o2" value="'.$cols.'" size="5" /></td>
+        </tr>
+        </table>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+    	break;
+    case 'radio':
+    	$options=str_replace('#HESK#',"\n",$query);
+    	echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	text = document.getElementById(\'o1\').value;
+            text = text.replace(/^\s\s*/, \'\').replace(/\s\s*$/, \'\');
+			text = escape(text);
+			if(text.indexOf(\'%0D%0A\') > -1)
+			{
+				re_nlchar = /%0D%0A/g ;
+			}
+		    else if(text.indexOf(\'%0A\') > -1)
+			{
+				re_nlchar = /%0A/g ;
+            }
+				else if(text.indexOf(\'%0D\') > -1)
+			{
+				re_nlchar = /%0D/g ;
+			}
+            else
+            {
+            	alert(\''.addslashes($hesklang['atl2']).'\');
+                return false;
+            }
+			text = unescape(text.replace(re_nlchar,\'#HESK#\'));
+
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = text;
+            window.close();
+        }
+        </script>
+
+        <p>'.$hesklang['opt2'].'</p>
+        <textarea name="o1" id="o1" rows="6" cols="40">'.$options.'</textarea>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+    	break;
+    case 'select':
+    	$options=str_replace('#HESK#',"\n",$query);
+    	echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	text = document.getElementById(\'o1\').value;
+            text = text.replace(/^\s\s*/, \'\').replace(/\s\s*$/, \'\');
+			text = escape(text);
+			if(text.indexOf(\'%0D%0A\') > -1)
+			{
+				re_nlchar = /%0D%0A/g ;
+			}
+		    else if(text.indexOf(\'%0A\') > -1)
+			{
+				re_nlchar = /%0A/g ;
+            }
+			else if(text.indexOf(\'%0D\') > -1)
+			{
+				re_nlchar = /%0D/g ;
+			}
+            else
+            {
+            	alert(\''.addslashes($hesklang['atl2']).'\');
+                return false;
+            }
+			text = unescape(text.replace(re_nlchar,\'#HESK#\'));
+
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = text;
+            window.close();
+        }
+        </script>
+
+        <p>'.$hesklang['opt3'].'</p>
+        <textarea name="o1" id="o1" rows="6" cols="40">'.$options.'</textarea>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+    	break;
+    case 'checkbox':
+    	$options=str_replace('#HESK#',"\n",$query);
+    	echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	text = document.getElementById(\'o1\').value;
+            text = text.replace(/^\s\s*/, \'\').replace(/\s\s*$/, \'\');
+			text = escape(text);
+			if(text.indexOf(\'%0D%0A\') > -1)
+			{
+				re_nlchar = /%0D%0A/g ;
+			}
+		    else if(text.indexOf(\'%0A\') > -1)
+			{
+				re_nlchar = /%0A/g ;
+            }
+			else if(text.indexOf(\'%0D\') > -1)
+			{
+				re_nlchar = /%0D/g ;
+			}
+            else
+            {
+            	alert(\''.addslashes($hesklang['atl2']).'\');
+                return false;
+            }
+			text = unescape(text.replace(re_nlchar,\'#HESK#\'));
+
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = text;
+            window.close();
+        }
+        </script>
+
+        <p>'.$hesklang['opt4'].'</p>
+        <textarea name="o1" id="o1" rows="6" cols="40">'.$options.'</textarea>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+    	break;
+    case 'date':
+        echo '<p>'.$hesklang['date_custom_field_text'].'</p>';
+        break;
+    case 'time':
+        echo '<p>'.$hesklang['time_custom_field_text'].'</p>';
+        break;
+    case 'datetime':
+        echo '<p>'.$hesklang['datetime_custom_field_text'].'</p>';
+        break;
+    case 'multiselect':
+        $options=str_replace('#HESK#',"\n",$query);
+        echo '
+        <script language="javascript">
+        function hesk_saveOptions()
+        {
+        	text = document.getElementById(\'o1\').value;
+            text = text.replace(/^\s\s*/, \'\').replace(/\s\s*$/, \'\');
+			text = escape(text);
+			if(text.indexOf(\'%0D%0A\') > -1)
+			{
+				re_nlchar = /%0D%0A/g ;
+			}
+		    else if(text.indexOf(\'%0A\') > -1)
+			{
+				re_nlchar = /%0A/g ;
+            }
+			else if(text.indexOf(\'%0D\') > -1)
+			{
+				re_nlchar = /%0D/g ;
+			}
+            else
+            {
+            	alert(\''.addslashes($hesklang['atl2']).'\');
+                return false;
+            }
+			text = unescape(text.replace(re_nlchar,\'#HESK#\'));
+
+        	window.opener.document.getElementById(\'s_'.$id.'_val\').value = text;
+            window.close();
+        }
+        </script>
+
+        <p>'.$hesklang['multiple_select_custom_field_text'].'</p>
+        <textarea name="o1" id="o1" rows="6" cols="40">'.$options.'</textarea>
+        <p><input type="button" value="  '.$hesklang['ok'].'  " onclick="Javascript:hesk_saveOptions()" /></p>
+        ';
+        break;
+    default:
+    	die('Invalid type');
+}
+?>
+
+<p align="center"><a href="#" onclick="Javascript:window.close()"><?php echo $hesklang['cwin']; ?></a></p>
+
+<p>&nbsp;</p>
+
+</body>
+
+</html>
+<?php
+exit();
+?>
diff --git a/language/en/text.php b/language/en/text.php
index 91b3ded9..335dbc63 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -23,9 +23,13 @@ $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
 // ADDED OR MODIFIED IN Mods For HESK 2.0.0
 $hesklang['date_custom_field'] = 'Date';
+$hesklang['date_custom_field_text'] = 'No options for this custom field type.';
 $hesklang['time_custom_field'] = 'Time';
+$hesklang['time_custom_field_text'] = 'No options for this custom field type.';
 $hesklang['datetime_custom_field'] = 'Date and time';
+$hesklang['datetime_custom_field_text'] = 'No options for this custom field type.';
 $hesklang['multiple_select_custom_field'] = 'Multiple Select box';
+$hesklang['multiple_select_custom_field_text'] = 'Options for this multi-select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
 
 // ADDED OR MODIFIED IN Mods For HESK 1.6.0
 $hesklang['ticket_closed'] = '[#%%TRACK_ID%%] Ticket closed/resolved';
