diff --git a/core/client/templates/-floating-header.hbs b/core/client/templates/-floating-header.hbs
index 7adea98f7d..5cb8203e2f 100644
--- a/core/client/templates/-floating-header.hbs
+++ b/core/client/templates/-floating-header.hbs
@@ -1,6 +1,6 @@
 <header class="floatingheader">
-    <button class="button-back" href="#">Back</button>
-    <button {{bind-attr class="featured:featured:unfeatured"}} title="Feature this post" {{action "toggleFeatured"}}>
+    <button type="button" class="button-back" href="#">Back</button>
+    <button type="button" {{bind-attr class="featured:featured:unfeatured"}} title="Feature this post" {{action "toggleFeatured"}}>
         <span class="hidden">Star</span>
     </button>
     <small>
diff --git a/core/client/templates/components/gh-modal-dialog.hbs b/core/client/templates/components/gh-modal-dialog.hbs
index 93022b4940..fc333f89e0 100644
--- a/core/client/templates/components/gh-modal-dialog.hbs
+++ b/core/client/templates/components/gh-modal-dialog.hbs
@@ -8,10 +8,10 @@
             </section>
             {{#if confirm}}
             <footer class="modal-footer">
-                <button {{bind-attr class="acceptButtonClass :js-button-accept"}} {{action "confirm" "accept"}}>
+                <button type="button" {{bind-attr class="acceptButtonClass :js-button-accept"}} {{action "confirm" "accept"}}>
                     {{confirm.accept.text}}
                 </button>
-                <button {{bind-attr class="rejectButtonClass :js-button-reject"}} {{action "confirm" "reject"}}>
+                <button type="button" {{bind-attr class="rejectButtonClass :js-button-reject"}} {{action "confirm" "reject"}}>
                     {{confirm.reject.text}}
                 </button>
             </footer>
diff --git a/core/client/templates/post-settings-menu.hbs b/core/client/templates/post-settings-menu.hbs
index 97addc7288..04f2a578c6 100644
--- a/core/client/templates/post-settings-menu.hbs
+++ b/core/client/templates/post-settings-menu.hbs
@@ -44,4 +44,4 @@
 		</tbody>
 	</table>
 </form>
-<button class="delete" {{action "openModal" "delete-post" this}}>Delete This Post</button>
+<button type="button" class="delete" {{action "openModal" "delete-post" this}}>Delete This Post</button>
diff --git a/core/client/templates/posts/index.hbs b/core/client/templates/posts/index.hbs
index 56af38ba9c..4fe3388167 100644
--- a/core/client/templates/posts/index.hbs
+++ b/core/client/templates/posts/index.hbs
@@ -1,6 +1,6 @@
 <div class="no-posts-box">
     <div class="no-posts">
         <h3>You Haven't Written Any Posts Yet!</h3>
-        {{#link-to "editor.new"}}<button class="button-add large" title="New Post">Write a new Post</button>{{/link-to}}
+        {{#link-to "editor.new"}}<button type="button" class="button-add large" title="New Post">Write a new Post</button>{{/link-to}}
     </div>
 </div>
diff --git a/core/client/templates/settings/apps.hbs b/core/client/templates/settings/apps.hbs
index 947a0b558e..6e492a013a 100644
--- a/core/client/templates/settings/apps.hbs
+++ b/core/client/templates/settings/apps.hbs
@@ -16,7 +16,7 @@
                 {{#if package}}{{package.name}} - {{package.version}}{{else}}{{name}} - package.json missing :({{/if}}
             </td>
             <td>
-                <button {{action toggleApp this}} {{bind-attr class=":js-button-active activeClass:button-delete inactiveClass:button-add activeClass:js-button-deactivate"}}>
+                <button type="button" {{action toggleApp this}} {{bind-attr class=":js-button-active activeClass:button-delete inactiveClass:button-add activeClass:js-button-deactivate"}}>
                     {{buttonText}}
                 </button>
             </td>
diff --git a/core/client/templates/settings/general.hbs b/core/client/templates/settings/general.hbs
index 7e505e8b1a..e0512791fe 100644
--- a/core/client/templates/settings/general.hbs
+++ b/core/client/templates/settings/general.hbs
@@ -5,7 +5,7 @@
 	{{#link-to 'settings' class='button-back button'}}Back{{/link-to}}
 
         <section class="page-actions">
-            <button class="button-save" {{action "save"}}>Save</button>
+            <button type="button" class="button-save" {{action "save"}}>Save</button>
         </section>
     </div>
 </header>
@@ -33,9 +33,9 @@
             <div class="form-group">
                 <label for="blog-logo">Blog Logo</label>
                 {{#if logo}}
-                    <button class="js-modal-logo" {{action "openModal" "upload" this "logo"}}><img id="blog-logo" {{bind-attr src=logo}} alt="logo"></button>
+                    <button type="button" class="js-modal-logo" {{action "openModal" "upload" this "logo"}}><img id="blog-logo" {{bind-attr src=logo}} alt="logo"></button>
                 {{else}}
-                    <button class="button-add js-modal-logo" {{action "openModal" "upload" this "logo"}}>Upload Image</button>
+                    <button type="button" class="button-add js-modal-logo" {{action "openModal" "upload" this "logo"}}>Upload Image</button>
                 {{/if}}
                 <p>Display a sexy logo for your publication</p>
             </div>
@@ -43,9 +43,9 @@
             <div class="form-group">
                 <label for="blog-cover">Blog Cover</label>
                 {{#if cover}}
-                    <button class="js-modal-cover" {{action "openModal" "upload" this "cover"}}><img id="blog-cover" {{bind-attr src=cover}} alt="cover photo"></button>
+                    <button type="button" class="js-modal-cover" {{action "openModal" "upload" this "cover"}}><img id="blog-cover" {{bind-attr src=cover}} alt="cover photo"></button>
                 {{else}}
-                    <button class="button-add js-modal-cover" {{action "openModal" "upload" this "cover"}}>Upload Image</button>
+                    <button type="button" class="button-add js-modal-cover" {{action "openModal" "upload" this "cover"}}>Upload Image</button>
                 {{/if}}
                 <p>Display a cover image on your site</p>
             </div>
diff --git a/core/client/templates/settings/users/user.hbs b/core/client/templates/settings/users/user.hbs
index 02c1908c0b..230858b2ee 100644
--- a/core/client/templates/settings/users/user.hbs
+++ b/core/client/templates/settings/users/user.hbs
@@ -28,7 +28,7 @@
 
     <header class="user-profile-header">
         <img id="user-cover" class="cover-image" {{bind-attr src=cover title=coverTitle}} />
-        <button class="edit-cover-image js-modal-cover button" {{action "openModal" "upload" user "cover"}}>Change Cover</button>
+        <button type="button" class="edit-cover-image js-modal-cover button" {{action "openModal" "upload" user "cover"}}>Change Cover</button>
     </header>
 
     <form class="user-profile" novalidate="novalidate" autocomplete="off">
@@ -37,7 +37,7 @@
 
             <figure class="user-image">
                 <div id="user-image" class="img" {{bind-attr style=image}} href="#"><span class="hidden">{{name}}"s Picture</span></div>
-                <button {{action "openModal" "upload" user "image"}} class="edit-user-image js-modal-image">Edit Picture</button>
+                <button type="button" {{action "openModal" "upload" user "image"}} class="edit-user-image js-modal-image">Edit Picture</button>
             </figure>
 
             <div class="form-group">
diff --git a/core/client/templates/setup.hbs b/core/client/templates/setup.hbs
index 9aeaa9c1d8..574536a66a 100644
--- a/core/client/templates/setup.hbs
+++ b/core/client/templates/setup.hbs
@@ -26,7 +26,7 @@
                 <p>Must be at least 8 characters</p>
             </div>
             <footer>
-                <button class="button-add large" {{action "setup"}} {{bind-attr disabled=submitting}}>Ok, Let's Do This</button>
+                <button type="submit" class="button-add large" {{action "setup"}} {{bind-attr disabled=submitting}}>Ok, Let's Do This</button>
             </footer>
         </form>
     </div>
diff --git a/core/client/templates/signup.hbs b/core/client/templates/signup.hbs
index 281b5b665d..eee4079eb4 100644
--- a/core/client/templates/signup.hbs
+++ b/core/client/templates/signup.hbs
@@ -21,7 +21,7 @@
                 <p>Must be at least 8 characters</p>
             </div>
             <footer>
-                <button class="button-add large" {{action "signup"}} {{bind-attr disabled=submitting}}>Create Account</button>
+                <button type="submit" class="button-add large" {{action "signup"}} {{bind-attr disabled=submitting}}>Create Account</button>
             </footer>
         </form>
     </div>