diff --git a/boot.php b/boot.php
index 77ff230563..4a0acef936 100644
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
set_time_limit(0);
define ( 'BUILD_ID', 1039 );
-define ( 'FRIENDIKA_VERSION', '2.10.0907' );
+define ( 'FRIENDIKA_VERSION', '2.10.0908' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'EOL', "
\r\n" );
diff --git a/mod/profiles.php b/mod/profiles.php
index 4e3f03799a..9e19caa0b0 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -68,7 +68,10 @@ function profiles_post(&$a) {
if($with != strip_tags($orig[0]['with'])) {
$prf = '';
$lookup = $with;
- if((strpos($lookup,'@')) || (strpos($lookup,'http://'))) {
+ if(strpos($lookup,'@') === 0)
+ $lookup = substr($lookup,1);
+ $lookup = str_replace('_',' ', $lookup);
+ if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
$newname = $lookup;
$links = @lrdd($lookup);
if(count($links)) {
@@ -101,6 +104,8 @@ function profiles_post(&$a) {
if($prf) {
$with = str_replace($lookup,'' . $newname . '', $with);
+ if(strpos($with,'@') === 0)
+ $with = substr($with,1);
}
}
else