diff --git a/actions/all.php b/actions/all.php
index 22da3cd681..f1786462e1 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -23,11 +23,10 @@
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Meitar Moscovitz <meitarm@gmail.com>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@controlyourself.ca>
- * @author   csarven <csarven@controlyourself.ca>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  * @link     http://status.net
  */
diff --git a/actions/api.php b/actions/api.php
index 243ae4c629..d570bb0174 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -28,7 +28,7 @@
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Gina Haeussge <osd@foosel.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  * @link     http://status.net
  */
diff --git a/index.php b/index.php
index fb37585908..d5174c2b7e 100644
--- a/index.php
+++ b/index.php
@@ -28,7 +28,7 @@
  * @author Jeffery To <jeffery.to@gmail.com>
  * @author Mike Cochrane <mikec@mikenz.geek.nz>
  * @author Robin Millette <millette@controlyourself.ca>
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
  * @author Tom Adams <tom@holizz.com>
  */
 
diff --git a/install.php b/install.php
index 4398757dea..81241315e1 100644
--- a/install.php
+++ b/install.php
@@ -28,7 +28,7 @@
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
diff --git a/theme/readme.txt b/theme/readme.txt
index 151b1fb71c..d030f2db4d 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -1,7 +1,7 @@
 /** Howto: create a statusnet theme
  *
  * @package   StatusNet
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/