diff --git a/src/css/main.css b/src/css/main.css
index 932ce06..73cfc59 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1316,10 +1316,8 @@ a.maitre-widget-social {
     font-weight: 400;
     font-size: 1.1em; }
   #maitre-content p[data-maitre-instructions] {
-    margin-top: 20px;
-    color: #999;
-    font-weight: 300;
-    font-size: 1em; }
+    margin-top: 12px;
+    color: #808591; }
   #maitre-content div[data-maitre-share-container] {
     padding-top: 50px; }
 
diff --git a/src/sass/index.scss b/src/sass/index.scss
index eace528..5d16f14 100644
--- a/src/sass/index.scss
+++ b/src/sass/index.scss
@@ -1367,10 +1367,8 @@ a.maitre-widget-social {
     font-size: 1.1em;
   }
   p[data-maitre-instructions] {
-    margin-top: 20px;
-    color: #999;
-    font-weight: 300;
-    font-size: 1em;
+    margin-top: 12px;
+    color: #808591;
   }
   div[data-maitre-share-container] {
     padding-top: 50px;
diff --git a/src/waitlist.html b/src/waitlist.html
index 7c25a30..aa276b7 100644
--- a/src/waitlist.html
+++ b/src/waitlist.html
@@ -100,6 +100,9 @@
                       },
 
                       afterSuccess: function(data, form) {
+                        console.log(data);
+
+                        jQuery("#maitre-people-behind-number").html("0");
 
                         jQuery("#maitre-share-plain-url").on('click', function () {
                           var link = document.createRange();
@@ -117,16 +120,21 @@
                         });
 
                         if (data.response == "subscriber_created") {
-
                           jQuery(".status-text").removeClass('shown');
                           jQuery("#maitre-verification").html(
                             "Remember to confirm your email to be added to the signup queue. <br /> Improve your position by referring your friends and spreading the word.");
-                          jQuery("#maitre-people-behind-number").html("0");
-                          jQuery("#maitre-share-plain-url").html("https://status.im/invite/" + data.code)
+                          jQuery("#maitre-share-plain-url").html("https://status.im/invite/" + data.code);
                           jQuery(".gradient-text").empty();
 
                           ga('send', 'event', 'Waitlist', 'Sign Up', 'Waitlist');
                         }
+
+                        if (data.response == "subscriber_retrieved") {
+                          jQuery(".status-text").removeClass('shown');
+                          jQuery("#maitre-header").html("You're already on the Waitlist!");
+                          jQuery("#maitre-instructions").html("You'll be notifed when Status is ready to launch.<br> Your position on the waitlist is shown below. Get access sooner by spreading the word!");
+                          jQuery("#maitre-share-plain-url").html("https://status.im/invite/" + data.code);
+                        }
                       },
                     }
                   };
diff --git a/src/welcome.html b/src/welcome.html
index 61ff015..8cfe0cd 100644
--- a/src/welcome.html
+++ b/src/welcome.html
@@ -97,13 +97,13 @@
               <h1>Thanks for confirming your email.</h1>
 
               <p>You'll be notifed when Status is ready to launch.<br /> Help us spread the word by inviting your friends! The more friends you invite, the sooner you'll get access: </p>
-          
+
                <div class="footer-icons-social">
                 <a id="emailLink" href="#" class="footer-icon icon-email" target="_blank"></a>
 
                 <a id="twitterLink" href="#" target="_blank" class="footer-icon icon-twitter"></a>
 
-                <a id="facebookLink" href="#" class="footer-icon icon-facebook"></a>
+                <a id="facebookLink" href="#" target="_blank" class="footer-icon icon-facebook"></a>
               </div>
 
                <p>Or share your unique link:</p><br/>