diff --git a/public/index.html b/public/index.html
index bb34543..f7e256c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -31,8 +31,8 @@
 </nav>
 
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 
 <script>
diff --git a/templates/blog/archive.html b/templates/blog/archive.html
index ea0a4b7..882d597 100644
--- a/templates/blog/archive.html
+++ b/templates/blog/archive.html
@@ -19,8 +19,8 @@
   {{/posts}}
 </ul>
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 <script>
 var _gaq = _gaq || []
diff --git a/templates/blog/index.html b/templates/blog/index.html
index 54a1e6e..608ba1a 100644
--- a/templates/blog/index.html
+++ b/templates/blog/index.html
@@ -49,8 +49,8 @@
 </script>
 {{/comments}}
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
 <script>
diff --git a/templates/blog/post.html b/templates/blog/post.html
index 5eb9a38..8254043 100644
--- a/templates/blog/post.html
+++ b/templates/blog/post.html
@@ -50,8 +50,8 @@
 </script>
 {{/comments}}
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 <script>
 var _gaq = _gaq || []
diff --git a/templates/proj/index.html b/templates/proj/index.html
index 922b069..6985aa0 100644
--- a/templates/proj/index.html
+++ b/templates/proj/index.html
@@ -49,8 +49,8 @@
   </tr>
 </table>
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 <p id="promote-js">
   <a class="img" href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/RegExp" title="JS RegExp .lastIndex"><img src="../images/promotejsv.gif" height="140" width="80" alt="JS RegExp .lastIndex"></a>
diff --git a/templates/proj/project.html b/templates/proj/project.html
index 75067ec..4c91d11 100644
--- a/templates/proj/project.html
+++ b/templates/proj/project.html
@@ -34,8 +34,8 @@
   <br class="clear">
 </div>
 <footer>
-  <p><a href="https://twitter.com/_sjs">@_sjs</a></p>
-  <p><a href="mailto:sami.samhuri@gmail.com">sami.samhuri@gmail.com</a></p>
+  <p>You can <a href="https://twitter.com/_sjs">find me on twitter</a>.</p>
+  <p><a href="mailto:sami@samhuri.net">sami@samhuri.net</a></p>
 </footer>
 <script>
 var _gaq = _gaq || []