diff --git a/htaccess.sample b/htaccess.sample
index 090857e4ab..cd8ba10038 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -16,6 +16,8 @@ RewriteRule ^main/openid$ index.php?action=openidlogin [L,QSA]
 
 RewriteRule ^main/subscribe$ index.php?action=subscribe [L,QSA]
 RewriteRule ^main/unsubscribe$ index.php?action=unsubscribe [L,QSA]
+RewriteRule ^main/confirmemail$ index.php?action=confirmemail [L,QSA]
+RewriteRule ^main/confirmemail/(.*)$ index.php?action=confirmemail&code=$1 [L,QSA]
 
 RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
 RewriteRule ^settings/password$ index.php?action=password [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index 42c9a1a0bc..646d93c3b7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -573,6 +573,8 @@ function common_fancy_url($action, $args=NULL) {
 		} else {
 			return common_path($args['nickname']);
 		}
+	 case 'confirmemail':
+		return common_path('main/confirmemail/'.$args['code']);
 	 default:
 		return common_simple_url($action, $args);
 	}