diff --git a/app/Http/Livewire/LoginForm.php b/app/Http/Livewire/LoginForm.php
index 7d10cb78ae..f4fe02f28f 100644
--- a/app/Http/Livewire/LoginForm.php
+++ b/app/Http/Livewire/LoginForm.php
@@ -38,11 +38,14 @@ class LoginForm extends Component
             $this->can_submit = false;
         } 
 
-        $this->validateOnly($fields);
-    
-        $this->can_submit = true;
-        
+        $whatever = $this->validateOnly($fields);
+        //\Log::info(print_r($whatever,true));
 
+        $errors = $this->getErrorBag();
+
+        $this->can_submit = $this->username !== "" && $this->password !== "" && !$errors->has('username') && !$errors->has('password') ; // wait, what?
+        
+        \Log::info("Oy - can we submit yet?!".$this->can_submit);
     }
     
     /**
@@ -58,7 +61,7 @@ class LoginForm extends Component
     public function submitForm()
     {
         
-        $this->can_submit = true;
+        //$this->can_submit = true;
         
         if (auth()->attempt($this->validate())) {
             return redirect()->intended('/');
diff --git a/resources/views/livewire/login-form.blade.php b/resources/views/livewire/login-form.blade.php
index d7cad82505..6561adc8e1 100644
--- a/resources/views/livewire/login-form.blade.php
+++ b/resources/views/livewire/login-form.blade.php
@@ -41,7 +41,7 @@
                                             <i class="fas fa-user" aria-hidden="true"></i> 
                                             {{ trans('admin/users/table.username')  }}
                                         </label>
-                                        <input class="form-control" placeholder="{{ trans('admin/users/table.username')  }}" name="username" type="text" autocomplete="off" wire:model="username" wire:model.defer="username" wire:model.lazy="username">
+                                        <input class="form-control" placeholder="{{ trans('admin/users/table.username')  }}" name="username" type="text" autocomplete="off" wire:model="username">
                                         @error('username') 
                                             <span class="alert-msg">
                                                 {{ $message }}
@@ -53,7 +53,7 @@
                                             <i class="fas fa-key" aria-hidden="true"></i> 
                                             {{ trans('admin/users/table.password')  }}
                                         </label>
-                                        <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" wire:model="password" wire:model.lazy="password" wire:model.defer="password" autocomplete="off">
+                                        <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" wire:model="password" autocomplete="off">
                                         @error('password') 
                                             <span class="alert-msg">
                                                 {{ $message }}