diff --git a/forms/TimeField.php b/forms/TimeField.php
index f2fea6791..22e243bee 100755
--- a/forms/TimeField.php
+++ b/forms/TimeField.php
@@ -1,39 +1,38 @@
 <?php
 /**
- * Time field.
- * Default Value represented in the format passed as constructor.
- * 
  * @todo Add localization support, see http://open.silverstripe.com/ticket/2931
  *
  * @package forms
  * @subpackage fields-datetime
  */
 class TimeField extends TextField {
-	// Stores our time format;
-	protected $timeformat;
+
+	/**
+	 * @var string $timeformat Time description compatible with date() syntax.
+	 */
+	protected $timeformat = "g:ia";
 	
 	/**
 	 * Constructor saves the format difference. Timefields shouldn't 
 	 * have a problem with length as times can only be represented in on way.
+	 * 
 	 * @param $name string The name of the field
 	 * @param $title string The Title of the field
 	 * @param $value string the value for the field
 	 * @param $timeformat string The Time format in date php format e.g. G:ia
 	 */
-	function __construct($name, $title = null, $value = "",$timeformat = "g:ia"){
+	function __construct($name, $title = null, $value = "",$timeformat = null){
 		parent::__construct($name,$title,$value);
-		$this->timeformat = $timeformat;
+		
+		if($timeformat) $this->timeformat = $timeformat;
 	}
 	
-	/**
-	 * Change the setValue to store the time (in a datetime field)
-	 * we store the current date as well (although we don't use it for this field)
-	 */
-	function setValue( $val ) {
-		if( $val )
-			$this->value = (date("Y-m-d",time()) . " " . date("H:i",strtotime($val)) );
-		else
-			$this->value = null;
+	function dataValue() {
+		return date($this->timeformat,strtotime($this->value));
+	}
+	
+	function setValue($val) {
+		$this->value = date($this->timeformat,strtotime($val));
 	}
 	
 	/**
@@ -43,18 +42,6 @@ class TimeField extends TextField {
 		return new TimeField_Readonly( $this->name, $this->title, $this->dataValue(),$this->timeformat);
 	}
 	
-	/**
-	 * Added to the value of the input, put the date into the format
-	 * specified in the constructer.
-	 */
-	function attrValue(){
-		if($this->value){
-			return date($this->timeformat,strtotime($this->value));	
-		}else{
-			return "";
-		}
-	}
-	
 }
 
 /**
diff --git a/tests/forms/TimeFieldTest.php b/tests/forms/TimeFieldTest.php
new file mode 100644
index 000000000..fb8e9fd98
--- /dev/null
+++ b/tests/forms/TimeFieldTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package sapphire
+ * @subpackage tests
+ */
+class TimeFieldTest extends SapphireTest {
+	function testDataValue12h() {
+		$dateField12h = new TimeField('Time', 'Time');
+		
+		$dateField12h->setValue('11pm');
+		$this->assertEquals($dateField12h->dataValue(), '11:00pm');
+				
+		$dateField12h->setValue('23:59');
+		$this->assertEquals($dateField12h->dataValue(), '11:59pm');
+		
+		$dateField12h->setValue('11:59pm');
+		$this->assertEquals($dateField12h->dataValue(), '11:59pm');
+	}
+	
+	function testDataValue24h() {
+		$dateField24h = new TimeField('Time', 'Time', null, 'H:i');
+		
+		$dateField24h->setValue('11pm');
+		$this->assertEquals($dateField24h->dataValue(), '23:00');
+		
+		$dateField24h->setValue('23:59');
+		$this->assertEquals($dateField24h->dataValue(), '23:59');
+		
+		$dateField24h->setValue('11:59pm');
+		$this->assertEquals($dateField24h->dataValue(), '23:59');
+	}
+}
\ No newline at end of file