diff --git a/js/bootstrap-buttons.js b/js/bootstrap-buttons.js
index ba52f1c06b8d9c4bf4ca311ff105710843c6dda0..f6c2bb4608aeaa01e1c8dde6917ecffcabcc221b 100644
--- a/js/bootstrap-buttons.js
+++ b/js/bootstrap-buttons.js
@@ -29,8 +29,12 @@
     state = state + 'Text'
     data.resetText || $el.data('resetText', $el.html())
 
-    $el.html( data[state] || $.fn.button.defaults[state] )
-
+    if(!$el.is('input[type=submit]')){
+	  	$el.html( data[state] || $.fn.button.defaults[state] )
+	  }else{
+		  $el.val( data[state] || $.fn.button.defaults[state] )
+	  }
+  
     setTimeout(function () {
       state == 'loadingText' ?
         $el.addClass(d).attr(d, d) :