diff --git a/mod/crepair.php b/mod/crepair.php
index 4babd6bf7b..afa45e881c 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -18,15 +18,16 @@ function crepair_post(&$a) {
 
 	$contact = $r[0];
 
-	$nick    = ((x($_POST,'nick')) ? $_POST['nick'] : null);
-	$url     = ((x($_POST,'url')) ? $_POST['url'] : null);
-	$request = ((x($_POST,'request')) ? $_POST['request'] : null);
-	$confirm = ((x($_POST,'confirm')) ? $_POST['confirm'] : null);
-	$notify  = ((x($_POST,'notify')) ? $_POST['notify'] : null);
-	$poll    = ((x($_POST,'poll')) ? $_POST['poll'] : null);
+	$nick    = ((x($_POST,'nick')) ? $_POST['nick'] : '');
+	$url     = ((x($_POST,'url')) ? $_POST['url'] : '');
+	$request = ((x($_POST,'request')) ? $_POST['request'] : '');
+	$confirm = ((x($_POST,'confirm')) ? $_POST['confirm'] : '');
+	$notify  = ((x($_POST,'notify')) ? $_POST['notify'] : '');
+	$poll    = ((x($_POST,'poll')) ? $_POST['poll'] : '');
+	$attag   = ((x($_POST,'attag')) ? $_POST['attag'] : '');
 
 
-	$r = q("UPDATE `contact` SET `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s'
+	$r = q("UPDATE `contact` SET `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' 
 		WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		dbesc($nick),
 		dbesc($url),
@@ -34,6 +35,7 @@ function crepair_post(&$a) {
 		dbesc($confirm),
 		dbesc($notify),
 		dbesc($poll),
+		dbesc($attag),
 		intval($contact['id']),
 		local_user()
 	);
@@ -84,6 +86,7 @@ function crepair_content(&$a) {
 	$o .= replace_macros($tpl, array(
 		'$label_name' => t('Name'),
 		'$label_nick' => t('Account Nickname'),
+		'$label_attag' => t('@Tagname - overrides Name/Nickname'),
 		'$label_url' => t('Account URL'),
 		'$label_request' => t('Friend Request URL'),
 		'$label_confirm' => t('Friend Confirm URL'),
@@ -97,6 +100,7 @@ function crepair_content(&$a) {
 		'$confirm'      => $contact['confirm'],
 		'$notify'       => $contact['notify'],
 		'$poll'         => $contact['poll'],
+		'$contact_attag'  => $contact['attag'],
 		'$lbl_submit'   => t('Submit')
 	));
 
diff --git a/view/crepair.tpl b/view/crepair.tpl
index 5870bac60a..c73fd0fdf1 100644
--- a/view/crepair.tpl
+++ b/view/crepair.tpl
@@ -7,6 +7,10 @@
 <input type="text" id="crepair-nick" name="nick" value="$contact_nick" />
 <div class="clear"></div>
 
+<label id="crepair-attag-label" for="crepair-attag">$label_attag</label>
+<input type="text" id="crepair-attag" name="attag" value="$contact_attag" />
+<div class="clear"></div>
+
 <label id="crepair-url-label" for="crepair-url">$label_url</label>
 <input type="text" id="crepair-url" name="url" value="$contact_url" />
 <div class="clear"></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d1b85bf7a7..8a681a0e09 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2435,6 +2435,7 @@ a.mail-list-link {
 }
 
 #crepair-nick-label,
+#crepair-attag-label,
 #crepair-url-label,
 #crepair-request-label,
 #crepair-confirm-label,
@@ -2446,6 +2447,7 @@ a.mail-list-link {
 }
 
 #crepair-nick,
+#crepair-attag,
 #crepair-url,
 #crepair-request,
 #crepair-confirm,
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 41de9b3e4b..d552d59c61 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2403,6 +2403,7 @@ a.mail-list-link {
 }
 
 #crepair-nick-label,
+#crepair-attag-label,
 #crepair-url-label,
 #crepair-request-label,
 #crepair-confirm-label,
@@ -2414,6 +2415,7 @@ a.mail-list-link {
 }
 
 #crepair-nick,
+#crepair-attag,
 #crepair-url,
 #crepair-request,
 #crepair-confirm,