diff --git a/admin/settings/settings-init.php b/admin/settings/settings-init.php
index 3789d8fb727..01a224c86ff 100644
--- a/admin/settings/settings-init.php
+++ b/admin/settings/settings-init.php
@@ -147,7 +147,16 @@ $woocommerce_settings['general'] = apply_filters('woocommerce_general_settings',
 		'checkboxgroup' => 'start',
 		'show_if_checked' => 'option'
 	),
-
+	
+	array(  
+		'desc' 		=> __( 'Enable coupon form on cart', 'woocommerce' ),
+		'id' 		=> 'woocommerce_enable_coupon_form_on_cart',
+		'std' 		=> 'yes',
+		'type' 		=> 'checkbox',
+		'checkboxgroup'	=> '',
+		'show_if_checked' => 'yes'
+	),
+	
 	array(  
 		'desc' 		=> __( 'Enable coupon form on checkout', 'woocommerce' ),
 		'id' 		=> 'woocommerce_enable_coupon_form_on_checkout',
diff --git a/templates/cart/cart.php b/templates/cart/cart.php
index fdd0347323c..1f024dbdcde 100755
--- a/templates/cart/cart.php
+++ b/templates/cart/cart.php
@@ -106,7 +106,7 @@ global $woocommerce;
 		<tr>
 			<td colspan="6" class="actions">
 
-				<?php if ( get_option( 'woocommerce_enable_coupons' ) == 'yes' ) { ?>
+				<?php if ( get_option( 'woocommerce_enable_coupons' ) == 'yes' && get_option( 'woocommerce_enable_coupon_form_on_cart' ) == 'yes') { ?>
 					<div class="coupon">
 					
 						<label for="coupon_code"><?php _e('Coupon', 'woocommerce'); ?>:</label> <input name="coupon_code" class="input-text" id="coupon_code" value="" /> <input type="submit" class="button" name="apply_coupon" value="<?php _e('Apply Coupon', 'woocommerce'); ?>" />