1 files changed, 3 insertions, 1 deletions
diff --git a/src/Controllers/LoginController.php b/src/Controllers/LoginController.php
index 9ae3a48..f9576fb 100644
--- a/src/Controllers/LoginController.php
+++ b/src/Controllers/LoginController.php
@@ -4,7 +4,6 @@ namespace App\Controllers;
 
 use App\Database;
 use App\Errors\AppException;
-use App\Errors\ErrorCode;
 use App\Errors\UnknownError;
 use App\Models\Device;
 use App\Models\Tokens;
@@ -13,6 +12,7 @@ use App\Support\Logger;
 use App\Support\Parser;
 use App\Support\RequestValidator;
 use Matrix\Data\LoginFlow;
+use Matrix\Enums\ErrorCode;
 use Matrix\Enums\LoginType;
 use Matrix\Enums\UserRegistrationKind;
 use Matrix\Responses\ClientLoginGetResponse;
@@ -57,6 +57,8 @@ class LoginController
     if (empty($userId["server"])) {
       #$userId = "@$userId[username]:$_ENV[DOMAIN]";
       $userId = "@$userId[username]:localhost";
+    } else {
+      $userId = "@$userId[username]:$userId[server]";
     }
 
     #if ($loginType == LoginType::PASSWORD) {}