diff --git a/jOOQ-website/download.php b/jOOQ-website/download.php
index 6fe25cfa64..afabc996f9 100644
--- a/jOOQ-website/download.php
+++ b/jOOQ-website/download.php
@@ -117,39 +117,6 @@ are some other products:
 	created out of necessity, as jOOQ supports MySQL's (and other databases') unsigned integers</p>
 </div>
 
-<div id="registration" style="display: none; width: 800px">
-  <div id="email">
-    <h3>Tell us a little bit about yourself</h3>
-	<sup>We will keep this information strictly confidential</sup>
-	    
-    <?php require 'registration-email.php'; ?> 
-  </div>
-  <div id="survey">
-    <h3>Help us understand your needs by completing this survey</h3>
-    <div class="row">
-      <div class="col col-3">
-          jOOQ has been the leading Java Open Source SQL building tool for the last three years. Feedback on social media such as Facebook, Twitter, reddit, Stack Overflow has been overwhelmingly positive.
-      </div>
-      <div class="col col-3">
-          You can influence jOOQ's future in the professional OSS world. By completing this survey, you help us take the right decisions to provide you with an even better Java / SQL integration in the future. All of the provided information will be kept strictly confidential.
-      </div>
-    </div>
-    <div class="row">
-      <div class="col col-1">&#160;</div>
-      <div class="col col-1">
-        <button id="survey">
-          Complete the survey
-        </button>
-      </div>
-      <div class="col col-1">
-        <button class="no-thanks" data-cookie="jooq-registration-survey" data-fade="survey">
-          No thanks
-        </button>  
-      </div>
-    </div>
-  </div>
-</div>
-
 
 <?php
 }
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index e5cb4afc50..7b5ad443b2 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -79,7 +79,7 @@ function manualHeader($isSingle, $forVersion) {
                      }
                      catch (ignore) {}
                  },
-                 registration = function() {
+                 registration = function(forceEmail, forceSurvey) {
                      var $email = $('#email'),
                          $save = $('.save'),
                          $survey = $('#survey'),
@@ -137,13 +137,19 @@ function manualHeader($isSingle, $forVersion) {
                          return false;
                      });
 
-                     if ($.cookie("jooq-registration-email")) {
+                     if ($.cookie("jooq-registration-email") && !forceEmail) {
                          $email.hide();
                      }
+                     else if (forceEmail) {
+                         $email.show();
+                     }
 
-                     if ($.cookie("jooq-registration-survey")) {
+                     if ($.cookie("jooq-registration-survey") && !forceSurvey) {
                          $survey.hide();
                      }
+                     else if (forceSurvey) {
+                         $survey.show();
+                     }
                      
                      $registration.modal();
                  };
@@ -156,7 +162,11 @@ function manualHeader($isSingle, $forVersion) {
                       track($(this).attr("href"));
                   });
                   
-            if ($registration) {
+            $("#newsletterbutton").click(function() {
+                registration(true, true);
+            });
+              
+            if ($registration && document.URL.indexOf("download.php") >= 0) {
                 if (!$.cookie("jooq-registration-email") ||
                     !$.cookie("jooq-registration-survey")) {
                     
@@ -230,6 +240,10 @@ function manualHeader($isSingle, $forVersion) {
                 <a href="http://www.facebook.com/sharer.php?u=http://www.jooq.org" target="_blank">
                     <img src="<?=$root?>/img/social-fb.png" width="37" height="27" alt="Share jOOQ on Facebook" title="Share jOOQ on Facebook"/></a>
             </div>
+            <div class="tweet-item">
+                <a id="newsletterbutton" href="#">
+                    <img src="<?=$root?>/img/social-nl.png" width="37" height="27" alt="Sign up for the jOOQ newsletter" title="Sign up for the jOOQ newsletter"/></a>
+            </div>
             
             <?php
             /*
@@ -315,5 +329,39 @@ function manualHeader($isSingle, $forVersion) {
         <div style="display: none">
             <img src="/img/logo.png" alt="The jOOQ Logo" title="jOOQ Logo"/>
         </div>
+        
+        <div id="registration" style="display: none; width: 800px">
+          <div id="email">
+            <h3>Tell us a little bit about yourself and join our newsletter</h3>
+            <sup>We will keep this information strictly confidential</sup>
+                
+            <?php require 'registration-email.php'; ?> 
+          </div>
+          <div id="survey">
+            <h3>Help us understand your needs by completing this survey</h3>
+            <div class="row">
+              <div class="col col-3">
+                  jOOQ has been the leading Java Open Source SQL building tool for the last three years. Feedback on social media such as Facebook, Twitter, reddit, Stack Overflow has been overwhelmingly positive.
+              </div>
+              <div class="col col-3">
+                  You can influence jOOQ's future in the professional OSS world. By completing this survey, you help us take the right decisions to provide you with an even better Java / SQL integration in the future. All of the provided information will be kept strictly confidential.
+              </div>
+            </div>
+            <div class="row">
+              <div class="col col-1">&#160;</div>
+              <div class="col col-1">
+                <button id="survey">
+                  Complete the survey
+                </button>
+              </div>
+              <div class="col col-1">
+                <button class="no-thanks" data-cookie="jooq-registration-survey" data-fade="survey">
+                  No thanks
+                </button>  
+              </div>
+            </div>
+          </div>
+        </div>
+                
     </body>
 </html>
diff --git a/jOOQ-website/img/social-email.png b/jOOQ-website/img/social-email.png
deleted file mode 100644
index 4a37229c8c..0000000000
Binary files a/jOOQ-website/img/social-email.png and /dev/null differ
diff --git a/jOOQ-website/img/social-email-hover.png b/jOOQ-website/img/social-nl-hover.png
similarity index 100%
rename from jOOQ-website/img/social-email-hover.png
rename to jOOQ-website/img/social-nl-hover.png
diff --git a/jOOQ-website/img/social-nl.png b/jOOQ-website/img/social-nl.png
new file mode 100644
index 0000000000..778d27c785
Binary files /dev/null and b/jOOQ-website/img/social-nl.png differ