diff --git a/index.html b/index.html
index a4dab695..5a750ec7 100644
--- a/index.html
+++ b/index.html
@@ -126,7 +126,7 @@
 <ul class="dropdown-menu" role="menu">
 <li><a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" target="_blank">Email</a></li>
 <li><a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" target="_blank">Facebook</a></li>
-<li><a href="https://twitter.com/share?url=https%3A%2F%2Fwww.privacytools.io&text=privacytools.io%20provides%20knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance." target="_blank">Twitter</a></li>
+<li><a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" target="_blank">Twitter</a></li>
 <li><a href="https://plus.google.com/share?url=https://www.privacytools.io" target="_blank">Google+</a></li>
 <li><a href="http://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" target="_blank">reddit</a></li>
 <li><a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" target="_blank">LinkedIn</a></li>
@@ -1898,7 +1898,7 @@ I don't want to live in a society that does these sort of things... I do not wan
     <i class="fa fa-facebook"></i>
 </a>
 
-<a href="https://twitter.com/share?url=https%3A%2F%2Fwww.privacytools.io&text=privacytools.io%20provides%20knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance." target="_blank" class="share-btn twitter" title="Twitter">
+<a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" target="_blank" class="share-btn twitter" title="Twitter">
     <i class="fa fa-twitter"></i>
 </a>