diff --git a/classes/Pessek/PessekChat/Bootstrap.php b/classes/Pessek/PessekChat/Bootstrap.php
index 43ca770..8bc4023 100755
--- a/classes/Pessek/PessekChat/Bootstrap.php
+++ b/classes/Pessek/PessekChat/Bootstrap.php
@@ -32,7 +32,7 @@ public function init() {
 		//Menus
 		$hooks = $this->elgg()->hooks;	
 		$this->elgg()->events->registerHandler('login:after', 'user', '\Pessek\PessekChat\PessekChatConfig::handle_after_login');
-		$this->elgg()->events->registerHandler('login:before', 'user', '\Pessek\PessekChat\PessekChatConfig::handle_before_login');
+//$this->elgg()->events->registerHandler('login:before', 'user', '\Pessek\PessekChat\PessekChatConfig::handle_before_login');
 		$this->elgg()->events->registerHandler('create', 'user', '\Pessek\PessekChat\PessekChatConfig::xmpp_user_when_elgg_user_create_by_admin');
 $this->elgg()->events->registerHandler('delete', 'user', '\Pessek\PessekChat\PessekChatConfig::xmpp_user_delete_by_admin');
 
diff --git a/classes/Pessek/PessekChat/PessekPrcXmlrpcElgg.php b/classes/Pessek/PessekChat/PessekPrcXmlrpcElgg.php
index 1a4c866..e04a6d9 100755
--- a/classes/Pessek/PessekChat/PessekPrcXmlrpcElgg.php
+++ b/classes/Pessek/PessekChat/PessekPrcXmlrpcElgg.php
@@ -26,7 +26,7 @@ public function send_accept_invitation(PessekPrcConnector $User1, PessekPrcConne
                     
                 }
                 
-                $this->invitation($User1, $User2, $NickName, $subs); //$this->invitation($User2, $User1, $NickName);
+                $this->invitation($User1, $User2, "", $subs); //$this->invitation($User2, $User1, $NickName);
                 $this->chat_user_vcard($User1, $User2, "FN", $fullname);
                 $this->chat_user_vcard($User1, $User2, "NICKNAME", $NickName);
             
diff --git a/views/default/resources/pessek_chat/migrate.php b/views/default/resources/pessek_chat/migrate.php
index 0c29861..85df419 100755
--- a/views/default/resources/pessek_chat/migrate.php
+++ b/views/default/resources/pessek_chat/migrate.php
@@ -66,8 +66,8 @@
 				$pessekRPC = new \Pessek\PessekChat\PessekPrcXmlrpcElgg(); 
 				$UserSender = new \Pessek\PessekChat\PessekPrcConnector($elggUsername, $userGroup, $password);
 				$UserReceiver = new \Pessek\PessekChat\PessekPrcConnector($userFriend->username, $userGroup,  $password);
-				$pessekRPC->migrateInvitation($UserSender, $UserReceiver, $NickName, "both");
-				$pessekRPC->migrateInvitation($UserReceiver, $UserSender, $NickName, "both");
+				$pessekRPC->migrateInvitation($UserSender, $UserReceiver, "", "both");
+				$pessekRPC->migrateInvitation($UserReceiver, $UserSender, "", "both");
 			}
 
 			// --- send notification to user