diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js
index 1649449d8..f7ca302ea 100644
--- a/templates/admin/default/assets/js/main.js
+++ b/templates/admin/default/assets/js/main.js
@@ -51,6 +51,24 @@
             });
         }
 
+        // -- Max usage --
+        if($('#is-unlimited').length){
+
+            if($('#is-unlimited').is(':checked')){
+                $('#max-usage').hide().val('');
+            }
+
+            $('#is-unlimited').change(function(){
+                if($('#is-unlimited').is(':checked')){
+                    $('#max-usage').hide().val('');
+                }
+                else{
+                    $('#max-usage').show();
+                }
+            });
+            
+        }
+
         // -- Confirm Box --
         if($('[data-toggle="confirm"]').length){
             $('[data-toggle="confirm"]').click(function(e){		
diff --git a/templates/admin/default/coupon/edit.html b/templates/admin/default/coupon/edit.html
index e7c23df73..f52bd88ea 100755
--- a/templates/admin/default/coupon/edit.html
+++ b/templates/admin/default/coupon/edit.html
@@ -65,45 +65,51 @@
 
 					<div class="control-group">
 					    <label for="max-usage">Max usage :</label>
+					    <label for="is-unlimited" class="checkbox">
+							<input id="is-unlimited" type="checkbox" name="isUnlimited" value="1">
+							Is unlimited ?
+						</label>
 					    <input id="max-usage" type="text" name="maxUsage" placeholder="max usage">					
 				  	</div>
 				</div>
 				
-				<div class="span8 well">
-					<div class="span6">
-						<div class="control-group">
-						    <label for="effect">Effect :</label>
-						    <select name="effect" id="effect" class="span12">
-						    	<option value="1" data-description="More description n°1 about item">Remove x percents for category Y</option>
-						    	<option value="2" data-description="More description n°2 about item">Remove x percents</option>
-						    	<option value="3" data-description="More description n°3 about item">Remove x amount</option>
-						    </select>
-						    <span class="help-block">More description n°1 about item</span>
-					    </div>			
+				<div class="span8">
+					<div class="well clearfix">
+						<div class="span6">
+							<div class="control-group">
+							    <label for="effect">Effect :</label>
+							    <select name="effect" id="effect" class="span12">
+							    	<option value="1" data-description="More description n°1 about item">Remove x percents for category Y</option>
+							    	<option value="2" data-description="More description n°2 about item">Remove x percents</option>
+							    	<option value="3" data-description="More description n°3 about item">Remove x amount</option>
+							    </select>
+							    <span class="help-block">More description n°1 about item</span>
+						    </div>			
+						</div>
+
+						<div class="span6">
+							<div class="control-group">
+							    <label for="amount">Amount :</label>
+							    <input id="amount" type="text" name="amount" placeholder="amount">					
+						  	</div>
+						  	<div class="control-group">
+							    <label for="category">Category :</label>
+							    <select name="category" id="category">
+							    	<option value="1">Category 1</option>
+							    	<option value="1">Category 2</option>
+							    	<option value="1">Category 3</option>
+							    </select>
+						    </div>
+						</div>
 					</div>
 
-					<div class="span6">
-						<div class="control-group">
-						    <label for="amount">Amount :</label>
-						    <input id="amount" type="text" name="amount" placeholder="amount">					
-					  	</div>
-					  	<div class="control-group">
-						    <label for="category">Category :</label>
-						    <select name="category" id="category">
-						    	<option value="1">Category 1</option>
-						    	<option value="1">Category 2</option>
-						    	<option value="1">Category 3</option>
-						    </select>
-					    </div>
-					</div>
+					<div class="control-group">
+					    <label for="short-description">Short description :</label>
+					    <textarea id="short-description" name="short-description" placeholder="short description" class="span12" rows="5"></textarea>				
+				  	</div>
 				</div>
 				
-				<div class="clearfix"></div>
-
-				<div class="control-group">
-				    <label for="short-description">Short description :</label>
-				    <textarea id="short-description" name="short-description" placeholder="short description" class="span12" rows="5"></textarea>				
-			  	</div>
+				<div class="clearfix"></div>				
 			  	
 				<div class="control-group">
 				    <label for="long-description">Long description :</label>