diff --git a/mod/settings.php b/mod/settings.php
index 1bca4f57ae..4c37247c63 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1103,14 +1103,12 @@ function settings_content(&$a) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
 
 
-	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+	//$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
 
 	$tpl_addr = get_markup_template("settings_nick_set.tpl");
 
 	$prof_addr = replace_macros($tpl_addr,array(
-		'$desc' => t('Your Identity Address is'),
-		'$nickname' => $nickname,
-		'$subdir' => $subdir,
+		'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname(), $a->get_baseurl().'/profile/'.$nickname),
 		'$or' => t('or'),
 		'$basepath' => $a->get_hostname()
 	));
diff --git a/view/templates/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl
index a8ef0c7e9c..8decc2dd4f 100644
--- a/view/templates/settings_nick_set.tpl
+++ b/view/templates/settings_nick_set.tpl
@@ -1,6 +1,6 @@
 
 
 <div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message"> {{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}} {{$or}} 'http(s)://{{$basepath}}/profile/{{$nickname}}'</div>
+<div id="settings-nickname-desc" class="info-message">{{$desc}}</div>
 </div>
 <div id="settings-nick-end" ></div>