diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6090417d41..b114cfc9ca 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -76,7 +76,7 @@ class LoginController extends Controller
             };
             
             try {
-                $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('active', '=', '1')->first();
+                $user = User::where('username', '=', $remote_user)->whereNull('deleted_at')->where('activated', '=', '1')->first();
                 LOG::debug("Remote user auth lookup complete");
                 if(!is_null($user)) Auth::login($user, true);
             } catch(Exception $e) {
diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
index 83ecd8a177..af05774f13 100644
--- a/app/Models/AssetMaintenance.php
+++ b/app/Models/AssetMaintenance.php
@@ -29,8 +29,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
         'asset_maintenance_type' => 'required',
         'title'                  => 'required|max:100',
         'is_warranty'            => 'boolean',
-        'start_date'             => 'required|date_format:"Y-m-d"',
-        'completion_date'        => 'nullable|date_format:"Y-m-d"',
+        'start_date'             => 'required|date',
+        'completion_date'        => 'nullable|date',
         'notes'                  => 'string|nullable',
         'cost'                   => 'numeric|nullable'
     ];