diff --git a/lib/components/button.vue b/lib/components/button.vue
index a81cae5390f..0d3569d5795 100755
--- a/lib/components/button.vue
+++ b/lib/components/button.vue
@@ -2,6 +2,7 @@
     <button v-bind="conditionalLinkProps"
             :is="componentType"
             :class="classList"
+            :type="btnType"
             :disabled="disabled"
             @click="onClick">
         <slot></slot>
@@ -23,10 +24,8 @@ const linkProps = Object.assign(omitLinkProps('href', 'to'), {
 
 export default {
     components: { bLink },
-
     computed: {
         linkProps: computed.linkProps,
-
         classList() {
             return [
                 'btn',
@@ -36,32 +35,28 @@ export default {
                 this.btnDisabled
             ];
         },
-
         componentType() {
             return (this.href || this.to) ? 'b-link' : 'button';
         },
-
         btnBlock() {
             return this.block ? `btn-block` : '';
         },
-
         btnVariant() {
             return this.variant ? `btn-${this.variant}` : `btn-secondary`;
         },
-
         btnSize() {
             return this.size ? `btn-${this.size}` : '';
         },
-
         btnDisabled() {
             return this.disabled ? 'disabled' : '';
         },
-
+        btnType() {
+            return (this.href || this.to) ? null : this.type; 
+        },
         conditionalLinkProps() {
             return this.componentType === 'button' ? {} : this.linkProps;
-        },
+        }
     },
-
     // merge our prepared link props with button props
     props: Object.assign(linkProps, {
         block: {
@@ -80,8 +75,11 @@ export default {
             type: String,
             default: null
         },
+        type: {
+            type: String,
+            default: 'button'
+        }
     }),
-
     methods: {
         onClick(e) {
             if (this.disabled) {