diff --git a/app/database/seeds/ConstantsSeeder.php b/app/database/seeds/ConstantsSeeder.php
index 73c31b2657e2..b519c7349f54 100755
--- a/app/database/seeds/ConstantsSeeder.php
+++ b/app/database/seeds/ConstantsSeeder.php
@@ -137,7 +137,7 @@ class ConstantsSeeder extends Seeder
 		Currency::create(array('name' => 'Singapore Dollar', 'code' => 'SGD', 'symbol' => 'SGD ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
         Currency::create(array('name' => 'Norske Kroner', 'code' => 'NOK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
         Currency::create(array('name' => 'New Zealand Dollar', 'code' => 'NZD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
-		Currency::create(array('name' => 'VietNam Dong', 'code' => 'VND', 'symbol' => 'VND ', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'));
+		Currency::create(array('name' => 'Vietnamese Dong', 'code' => 'VND', 'symbol' => 'VND ', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 
 		DatetimeFormat::create(array('format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013'));
 		DatetimeFormat::create(array('format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013'));
diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php
index dab8c7044285..7210d7b45116 100755
--- a/app/views/accounts/payments.blade.php
+++ b/app/views/accounts/payments.blade.php
@@ -15,8 +15,8 @@
 			@foreach ($accountGateway->fields as $field => $junk)
 				@if (in_array($field, ['solutionType', 'landingPage', 'headerImageUrl', 'brandName']))
 					{{-- do nothing --}}
-				@else
-					{{ Former::populateField($accountGateway->gateway_id.'_'.$field, $config->$field) }}
+				@elseif (isset($config->$field))
+                    {{ Former::populateField($accountGateway->gateway_id.'_'.$field, $config->$field) }}                    
 				@endif
 			@endforeach
 		@endif
diff --git a/bootstrap/environment.default.php b/bootstrap/environment.default.php
index c12ddd0b5998..60409212e89a 100755
--- a/bootstrap/environment.default.php
+++ b/bootstrap/environment.default.php
@@ -1,4 +1,4 @@
 <?php
 
-return 'development';
+return 'production';