diff --git a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
index 2676764..130b1d4 100644
--- a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
+++ b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Account;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Mail;
@@ -50,13 +51,21 @@ class AuthenticateController extends Controller
 
     public function loginEmail(Request $request)
     {
-        return view('account.login.email');
+        return view('account.login.email', [
+            'domain' => '@' . config('app.sip_domain')
+        ]);
     }
 
     public function authenticateEmail(Request $request)
     {
         $request->validate([
             'email' => 'required|email|exists:external.accounts,email',
+            'username' => [
+                'required',
+                Rule::exists('external.accounts', 'username')->where(function ($query) use ($request) {
+                    $query->where('email', $request->get('email'));
+                }),
+            ],
             'g-recaptcha-response'  => 'required|captcha',
         ]);
 
diff --git a/flexiapi/app/Http/Controllers/Account/RegisterController.php b/flexiapi/app/Http/Controllers/Account/RegisterController.php
index 3795615..ad54f60 100644
--- a/flexiapi/app/Http/Controllers/Account/RegisterController.php
+++ b/flexiapi/app/Http/Controllers/Account/RegisterController.php
@@ -49,7 +49,7 @@ class RegisterController extends Controller
             'terms' => 'accepted',
             'username' => 'required|unique:external.accounts,username|min:6',
             'g-recaptcha-response'  => 'required|captcha',
-            'email' => 'required|email|unique:external.accounts,email|confirmed'
+            'email' => 'required|email|confirmed'
         ]);
 
         $account = new Account;
diff --git a/flexiapi/resources/views/account/login/email.blade.php b/flexiapi/resources/views/account/login/email.blade.php
index 9e1b62d..f072f3f 100644
--- a/flexiapi/resources/views/account/login/email.blade.php
+++ b/flexiapi/resources/views/account/login/email.blade.php
@@ -11,6 +11,15 @@
                         {!! Form::label('email', 'Email') !!}
                         {!! Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => 'myemail@address.org', 'required']) !!}
                     </div>
+                    <div class="form-group">
+                        {!! Form::label('username', 'SIP Username') !!}
+                        <div class=" input-group mb-3">
+                            {!! Form::text('username', old('username'), ['class' => 'form-control', 'placeholder' => 'username', 'required']) !!}
+                            <div class="input-group-append">
+                                <span class="input-group-text" id="basic-addon2">{{ $domain }}</span>
+                            </div>
+                        </div>
+                    </div>
                     @include('parts.captcha')
                     {!! Form::submit('Send the authentication link', ['class' => 'btn btn-primary btn-centered']) !!}
                 {!! Form::close() !!}