diff --git a/partials/subscribe-form.hbs b/partials/subscribe-form.hbs
new file mode 100644
index 00000000..dc3f8bd3
--- /dev/null
+++ b/partials/subscribe-form.hbs
@@ -0,0 +1,19 @@
+<section class="subscribe-form">
+    <h3 class="subscribe-form-title">Subscribe to {{@site.title}}</h3>
+    <p class="subscribe-form-description">Get the latest posts delivered right to your inbox</p>
+    <form data-members-form="subscribe">
+        <div class="form-group">
+            <input class="subscribe-email" data-members-email placeholder="youremail@example.com" autocomplete="false" />
+            <button class="button primary" type="submit">
+                <span class="button-content">Subscribe</span>
+                <span class="button-loader">{{> "icons/loader"}}</span>
+            </button>
+        </div>
+        <div class="message-success">
+            <strong>Great!</strong> Check your inbox and click the link to confirm your subscription.
+        </div>
+        <div class="message-error">
+            Please enter a valid email address!
+        </div>
+    </form>
+</section>
\ No newline at end of file
diff --git a/post.hbs b/post.hbs
index 8043c213..989f81e2 100644
--- a/post.hbs
+++ b/post.hbs
@@ -22,20 +22,18 @@
     </div>
 
     {{!-- Email subscribe form at the bottom of the page --}}
-    {{#if @labs.subscribers}}
-    <section class="subscribe-form">
-        <h3 class="subscribe-form-title">Subscribe to {{@site.title}}</h3>
-        <p>Get the latest posts delivered right to your inbox</p>
-        {{subscribe_form placeholder="youremail@example.com"}}
-    </section>
+    {{#if @labs.members}}
+        {{> subscribe-form}}
     {{/if}}
 
     <footer class="post-content-footer">
 
-        {{!-- There are two options for how we display the byline/author-info.
-        If the post has more than one author, we load a specific template
-        from includes/byline-multiple.hbs, otherwise, we just use the
-        default byline. --}}
+        <div class="post-authors">
+            Written by
+            {{#foreach authors}}
+                <a href="{{url}}">{{name}}</a>
+            {{/foreach}}
+        </div>
 
     </footer>