diff --git a/mod/settings.php b/mod/settings.php
index dba12fa87..ca0829f02 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1103,14 +1103,12 @@ function settings_content(&$a) {
info( t('Profile is not published.') . EOL );
- $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+ //$subdir = ((strlen($a->get_path())) ? '
' . 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 '%s' or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), $a->get_baseurl().'/profile/'.$nickname),
'$basepath' => $a->get_hostname()
));
diff --git a/view/templates/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl
index 3162bbfca..8decc2dd4 100644
--- a/view/templates/settings_nick_set.tpl
+++ b/view/templates/settings_nick_set.tpl
@@ -1,6 +1,6 @@