diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 5f6b1396..e3cca128 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -249,19 +249,24 @@ $(document).ready(function(){
 
 	// Select for account types
 	$(".accounts-type").on('click', function(e){
+		var account_id = $(this).attr('id').substr(8);
+
 		if($(this).hasClass('selected-account') == true){
 			$(this).removeClass('selected-account');
+			$(".item-row").each(function(i){
+	        	if($(this).children().find("#item-account-type").text() == account_id){
+	        		$(this).removeClass("selected-item");
+	        	}
+	        });
 		}
 		else {
 	    	$(this).addClass('selected-account');
-	    }
-
-	    var account_id = $(this).attr('id').substr(8);
-        $(".item-row").each(function(i){
-        	if($(this).children().find("#item-account-type").text() == account_id){
-        		$(this).addClass("selected-item");
-        	}
-        });       
+	    	$(".item-row").each(function(i){
+	        	if($(this).children().find("#item-account-type").text() == account_id){
+	        		$(this).addClass("selected-item");
+	        	}
+	        });
+	    }        
 	});
 
 	// Calculate Net Discount for Payment