diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 4a6d114c..ae2e1b25 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -284,6 +284,9 @@ ul.notes {
     margin-top: 8px;
     margin-left: 15px;
     @extend .pull-left;
-    width: 35%;
+  }
+
+  .js-notify-commit-author {
+    float: left;
   }
 }
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index eadf5bc6..c2bdeafb 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -28,12 +28,12 @@
 
     .note-form-option
       = label_tag :notify do
-        = check_box_tag :notify, 1, !@note.for_commit?
+        = check_box_tag :notify, 1, false
         %span.light Notify team via email
 
       .js-notify-commit-author
         = label_tag :notify_author do
-          = check_box_tag :notify_author, 1 , @note.for_commit?
+          = check_box_tag :notify_author, 1 , false
           %span.light Notify commit author
     .note-form-option
       %a.choose-btn.btn.btn-small.js-choose-note-attachment-button