diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 2ead90c7..e5c12572 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -680,8 +680,10 @@ $(document).ready(function(){
     $('#pay').click(function() {
       sub_total = $('#sub-total').text();
       member = $('#membership_id').text();
-      if (payment_type && payment_type.length > 0 && !other_payments.some(x => payment_type.indexOf(x[0]) >= 0 && x[1] > 0) && sub_total != 0.0 && member) {
+      if (payment_type && payment_type.length > 0 && parseInt(jQuery.inArray("Credit", payment_type)) == -1 && !other_payments.some(x => payment_type.indexOf(x[0]) >= 0 && x[1] > 0) && sub_total != 0.0 && member) {
         swal("Oops","Please Pay with " + payment_methods.find(x => payment_type.indexOf(x) >= 0) + " Payment","warning");
+      } else if (payment_type && payment_type.length > 0 && parseInt(jQuery.inArray("Credit", payment_type)) != -1 && $('#credit').text() == 0 && sub_total != 0.0 && member) {
+        swal("Oops","Please Pay with Credit Payment","warning");
       } else {
         $( "#loading_wrapper").show();
         if($('#balance').text() > 0){