diff --git a/templates/course.hamlet b/templates/course.hamlet
index dfe9c0235..4fc2f9366 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <div .container>
   <dl .deflist>
     <dt .deflist__dt>Fakultät/Institut
diff --git a/templates/table/cell/header.hamlet b/templates/table/cell/header.hamlet
index 408dc4561..d5d86cf90 100644
--- a/templates/table/cell/header.hamlet
+++ b/templates/table/cell/header.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <th .table__th *{attrs} :isSortable:.sortable :isSorted SortAsc:.sorted-asc :isSorted SortDesc:.sorted-desc>
   $maybe flag <- sortableKey
     $case directions
diff --git a/templates/widgets/link-email.hamlet b/templates/widgets/link-email.hamlet
index 80b6b03c9..ad08eeba5 100644
--- a/templates/widgets/link-email.hamlet
+++ b/templates/widgets/link-email.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $# Used for all mailto-link, and used as both as shamlet and whamlet at once.
 <a href="mailto:#{email}">
-  ^{linkText}
\ No newline at end of file
+  ^{linkText}
diff --git a/templates/widgets/register-form/register-form.hamlet b/templates/widgets/register-form/register-form.hamlet
index c9a9fa1a3..347b94186 100644
--- a/templates/widgets/register-form/register-form.hamlet
+++ b/templates/widgets/register-form/register-form.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $# extra protects us against CSRF
 #{extra}
 $# Maybe display textField for passcode