diff --git a/core/model/fieldtypes/Currency.php b/core/model/fieldtypes/Currency.php
index ec3ce57c5..b1a840ee7 100644
--- a/core/model/fieldtypes/Currency.php
+++ b/core/model/fieldtypes/Currency.php
@@ -15,15 +15,19 @@ class Currency extends Decimal {
 	
 	function Nice() {
 		// return "<span title=\"$this->value\">$" . number_format($this->value, 2) . '</span>';
-		return '$' . number_format($this->value, 2);
+		$val = '$' . number_format(abs($this->value), 2);
+		if($this->value < 0) return "($val)";
+		else return $val;
 	}
 	
 	function Whole() {
-		return '$' . number_format($this->value, 0);
+		$val = '$' . number_format(abs($this->value), 0);
+		if($this->value < 0) return "($val)";
+		else return $val;
 	}
 	
 	function setValue($value) {
-		$this->value = ereg_replace('[^0-9.]+','', $value);
+		$this->value = ereg_replace('[^0-9.\-]+','', $value);
 	}
 }
 
diff --git a/tests/fieldtypes/CurrencyTest.php b/tests/fieldtypes/CurrencyTest.php
new file mode 100644
index 000000000..dd40e9571
--- /dev/null
+++ b/tests/fieldtypes/CurrencyTest.php
@@ -0,0 +1,24 @@
+<?php
+
+class CurrencyTest extends SapphireTest {
+	function testNiceFormatting() {
+		// Test a bunch of different data values and results in Nice() and Whole()
+		$tests = array(
+			'$50.00' => array('$50.00', '$50'),
+			'this is -50.29 dollars' => array('($50.29)', '($50)'),
+			'this is -50.79 dollars' => array('($50.79)', '($51)'),
+			'this is 50.79 dollars' => array('$50.79', '$51'),
+			'-1000' => array('($1,000.00)','($1,000)'),
+			'-$2000' => array('($2,000.00)', '($2,000)'),
+			'5000' => array('$5,000.00', '$5,000'),
+		);
+		
+		foreach($tests as $value => $niceValues) {
+			$c = new Currency('MyField');
+			$c->setValue($value);
+			$this->assertEquals($niceValues[0], $c->Nice());
+			$this->assertEquals($niceValues[1], $c->Whole());
+		}
+	}	
+	
+}
\ No newline at end of file