diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index e76d17c23ae46c7cc202b5f7ece2ebe6bd6289ba..9b0718ae6e33beb71c0fb5a2658785cdf84f633b 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -1055,17 +1055,6 @@ class Users extends CRMEntity {
 			$this->column_fields['currency_symbol_placement'] = $this->currency_symbol_placement = '$1.0';
 		}
 
-		// TODO - This needs to be cleaned up once default values for fields are picked up in a cleaner way.
-		// This is just a quick fix to ensure things doesn't start breaking when the user currency configuration is missing
-		if($this->column_fields['currency_grouping_pattern'] == ''
-				&& $this->column_fields['currency_symbol_placement'] == '') {
-
-			$this->column_fields['currency_grouping_pattern'] = $this->currency_grouping_pattern = '123,456,789';
-			$this->column_fields['currency_decimal_separator'] = $this->currency_decimal_separator = '.';
-			$this->column_fields['currency_grouping_separator'] = $this->currency_grouping_separator = ',';
-			$this->column_fields['currency_symbol_placement'] = $this->currency_symbol_placement = '$1.0';
-		}
-
 		$this->id = $record;
 		$log->debug("Exit from retrieve_entity_info($record, $module) method.");