From 32a7c50189b46058d53b8a1de6c2846a16f5e549 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 11 Sep 2018 07:51:35 -0500
Subject: [PATCH] Use Laravel authentication (#8702)

* Use Laravel for authentication
Support legacy auth methods
Always create DB entry for users (segregate by auth method)

Port api auth to Laravel

restrict poller errors to devices the user has access to

Run checks on every page load.  But set a 5 minute (configurable) timer.
Only run some checks if the user is an admin

Move toastr down a few pixels so it isn't as annoying.

Fix menu not loaded on laravel pages when twofactor is enabled for the system, but disabled for the user.
Add two missing menu entries in the laravel menu

Rewrite 2FA code
Simplify some and verify code before applying

Get http-auth working
Handle legacy $_SESSION differently.  Allows Auth::once(), etc to work.

* Fix tests and mysqli extension check

* remove duplicate Toastr messages

* Fix new items

* Rename 266.sql to 267.sql
---
 .../ActiveDirectoryAuthorizer.php             |  30 ---
 LibreNMS/Authentication/Auth.php              |  66 ------
 LibreNMS/Authentication/AuthorizerBase.php    | 180 +--------------
 LibreNMS/Authentication/LdapAuthorizer.php    |  15 --
 LibreNMS/Authentication/LegacyAuth.php        | 101 +++++++++
 LibreNMS/Authentication/MysqlAuthorizer.php   | 118 +++++++---
 LibreNMS/Authentication/TwoFactor.php         | 122 +---------
 LibreNMS/IRCBot.php                           |  16 +-
 .../Interfaces/Authentication/Authorizer.php  |  36 ---
 LibreNMS/ObjectCache.php                      |   2 +-
 adduser.php                                   |   8 +-
 app/Checks.php                                |  46 ++--
 app/Guards/ApiTokenGuard.php                  |  47 ++++
 app/Http/Controllers/AjaxController.php       |   2 +
 app/Http/Controllers/Auth/LoginController.php |  18 +-
 app/Http/Controllers/LegacyController.php     |   4 +
 app/Http/Controllers/TwoFactorController.php  | 204 +++++++++++++++++
 app/Http/Kernel.php                           |   3 +
 app/Http/Middleware/LegacyExternalAuth.php    |  48 ++++
 .../Middleware/RedirectIfAuthenticated.php    |   2 +-
 app/Http/Middleware/VerifyTwoFactor.php       |  40 ++++
 app/Http/ViewComposers/LayoutComposer.php     |  61 +++++
 app/Http/ViewComposers/MenuComposer.php       |   2 +-
 app/Listeners/AuthEventListener.php           |  75 +++++++
 app/Models/ApiToken.php                       |  87 ++++++++
 app/Models/Dashboard.php                      |   2 +-
 app/Models/Device.php                         |  48 ++++
 app/Models/NotificationAttrib.php             |  17 +-
 app/Models/User.php                           |  63 +++++-
 app/Models/UserPref.php                       | 128 +++++++++++
 app/Models/UserWidget.php                     |  41 ++++
 app/Providers/AppServiceProvider.php          |   6 +-
 app/Providers/AuthServiceProvider.php         |  26 ++-
 app/Providers/ComposerServiceProvider.php     |   1 +
 app/Providers/EventServiceProvider.php        |   6 +-
 app/Providers/LegacyUserProvider.php          | 210 ++++++++++++++++++
 .../TokenUserProvider.php}                    |  55 ++---
 config/auth.php                               |   9 +-
 config/debugbar.php                           |   5 +-
 doc/Developing/Code-Structure.md              |   2 +-
 html/ajax_dash.php                            |   4 +-
 html/ajax_form.php                            |   4 +-
 html/ajax_list.php                            |   4 +-
 html/ajax_listports.php                       |   4 +-
 html/ajax_ossuggest.php                       |   4 +-
 html/ajax_output.php                          |   4 +-
 html/ajax_rulesuggest.php                     |   4 +-
 html/ajax_search.php                          |  36 +--
 html/ajax_table.php                           |   4 +-
 html/css/styles.css                           |   8 +-
 html/includes/api_functions.inc.php           |  65 +++---
 html/includes/authenticate.inc.php            |  87 --------
 html/includes/common/availability-map.inc.php |  10 +-
 html/includes/common/graylog.inc.php          |   6 +-
 html/includes/common/server-stats.inc.php     |   6 +-
 html/includes/common/top-devices.inc.php      |  20 +-
 html/includes/common/top-interfaces.inc.php   |  10 +-
 html/includes/common/worldmap.inc.php         |   6 +-
 html/includes/forms/ack-alert.inc.php         |   4 +-
 html/includes/forms/add-dashboard.inc.php     |   4 +-
 html/includes/forms/alert-rules.inc.php       |   4 +-
 html/includes/forms/alert-templates.inc.php   |   6 +-
 html/includes/forms/alert-transports.inc.php  |   6 +-
 .../includes/forms/application-update.inc.php |   4 +-
 .../forms/attach-alert-template.inc.php       |   4 +-
 html/includes/forms/callback-clear.inc.php    |   4 +-
 .../forms/callback-statistics.inc.php         |   4 +-
 html/includes/forms/component.inc.php         |   4 +-
 .../forms/config-item-disable.inc.php         |   4 +-
 .../includes/forms/config-item-update.inc.php |   4 +-
 html/includes/forms/config-item.inc.php       |   4 +-
 html/includes/forms/convert-template.inc.php  |   4 +-
 html/includes/forms/create-alert-item.inc.php |   4 +-
 .../forms/create-device-group.inc.php         |   4 +-
 html/includes/forms/create-service.inc.php    |   4 +-
 html/includes/forms/delete-alert-rule.inc.php |   4 +-
 .../forms/delete-alert-template.inc.php       |   4 +-
 .../forms/delete-alert-transport.inc.php      |   4 +-
 .../forms/delete-cluster-poller.inc.php       |   4 +-
 html/includes/forms/delete-dashboard.inc.php  |   6 +-
 .../forms/delete-device-group.inc.php         |   4 +-
 .../forms/delete-host-dependency.inc.php      |   4 +-
 html/includes/forms/delete-poller.inc.php     |   4 +-
 html/includes/forms/delete-service.inc.php    |   4 +-
 .../forms/delete-transport-group.inc.php      |   4 +-
 .../forms/discovery-module-update.inc.php     |   4 +-
 html/includes/forms/edit-dashboard.inc.php    |   4 +-
 .../forms/get-host-dependencies.inc.php       |   8 +-
 html/includes/forms/get-vmlist.inc.php        |   6 +-
 html/includes/forms/mempool-update.inc.php    |   4 +-
 html/includes/forms/notifications.inc.php     |  16 +-
 html/includes/forms/override-config.inc.php   |   4 +-
 html/includes/forms/parse-alert-rule.inc.php  |   4 +-
 .../forms/parse-alert-template.inc.php        |   4 +-
 .../includes/forms/parse-device-group.inc.php |   4 +-
 .../forms/parse-poller-groups.inc.php         |   4 +-
 html/includes/forms/parse-service.inc.php     |   4 +-
 .../forms/parse-template-rules.inc.php        |   4 +-
 .../forms/poller-group-remove.inc.php         |   4 +-
 html/includes/forms/poller-groups.inc.php     |   4 +-
 .../forms/poller-module-update.inc.php        |   4 +-
 html/includes/forms/processor-update.inc.php  |   4 +-
 html/includes/forms/rediscover-device.inc.php |   4 +-
 .../forms/refresh-oxidized-node.inc.php       |   6 +-
 .../forms/reload-oxidized-nodes-list.inc.php  |   4 +-
 .../forms/save-host-dependency.inc.php        |   4 +-
 .../forms/schedule-maintenance.inc.php        |  18 +-
 .../includes/forms/sensor-alert-reset.inc.php |   4 +-
 .../forms/sensor-alert-update.inc.php         |   4 +-
 html/includes/forms/sensor-update.inc.php     |   4 +-
 .../forms/show-alert-transport.inc.php        |   4 +-
 .../forms/show-transport-group.inc.php        |   4 +-
 .../forms/sql-from-alert-collection.inc.php   |   4 +-
 html/includes/forms/storage-update.inc.php    |   4 +-
 html/includes/forms/test-transport.inc.php    |   4 +-
 html/includes/forms/token-item-create.inc.php |   4 +-
 .../includes/forms/token-item-disable.inc.php |   4 +-
 html/includes/forms/token-item-remove.inc.php |   4 +-
 html/includes/forms/transport-groups.inc.php  |   4 +-
 html/includes/forms/update-alert-rule.inc.php |   4 +-
 .../includes/forms/update-config-item.inc.php |   4 +-
 .../forms/update-dashboard-config.inc.php     |  12 +-
 html/includes/forms/update-notes.inc.php      |   4 +-
 html/includes/forms/update-ports.inc.php      |   4 +-
 html/includes/forms/widget-settings.inc.php   |   4 +-
 .../forms/wireless-sensor-alert-reset.inc.php |   4 +-
 .../wireless-sensor-alert-update.inc.php      |   4 +-
 .../forms/wireless-sensor-update.inc.php      |   4 +-
 html/includes/front/top_device_bits.inc.php   |   6 +-
 html/includes/front/top_ports.inc.php         |   8 +-
 html/includes/functions.inc.php               |  20 +-
 html/includes/graphs/customer/auth.inc.php    |   4 +-
 html/includes/graphs/global/auth.inc.php      |   4 +-
 html/includes/hostbox-public.inc.php          |  67 ------
 html/includes/list/devices.inc.php            |   6 +-
 html/includes/list/groups.inc.php             |   4 +-
 html/includes/list/transport_groups.inc.php   |   4 +-
 html/includes/list/transports.inc.php         |   4 +-
 .../modal/alert_rule_collection.inc.php       |   4 +-
 html/includes/modal/alert_schedule.inc.php    |  22 +-
 html/includes/modal/alert_template.inc.php    |   4 +-
 .../modal/attach_alert_template.inc.php       |   4 +-
 html/includes/modal/delete_alert_rule.inc.php |   4 +-
 .../modal/delete_alert_template.inc.php       |   4 +-
 .../modal/delete_device_group.inc.php         |   4 +-
 .../modal/delete_host_dependency.inc.php      |   4 +-
 html/includes/modal/delete_poller.inc.php     |   4 +-
 html/includes/modal/delete_service.inc.php    |   4 +-
 .../modal/edit_alert_transport.inc.php        |   4 +-
 .../modal/edit_host_dependency.inc.php        |   4 +-
 .../modal/edit_transport_group.inc.php        |   4 +-
 .../modal/manage_host_dependencies.inc.php    |   8 +-
 html/includes/modal/new_alert_rule.inc.php    |   4 +-
 html/includes/modal/new_bill.inc.php          |   4 +-
 html/includes/modal/new_device_group.inc.php  |   4 +-
 html/includes/modal/new_service.inc.php       |   4 +-
 html/includes/modal/poller_groups.inc.php     |   4 +-
 .../modal/remove_alert_schedule.inc.php       |   4 +-
 html/includes/output/capture.inc.php          |   4 +-
 html/includes/output/query.inc.php            |   4 +-
 html/includes/print-alert-rules.php           |  10 +-
 html/includes/print-alert-templates.php       |   4 +-
 html/includes/print-alert-transports.php      |   4 +-
 html/includes/print-graph-alerts.inc.php      |   8 +-
 html/includes/print-interface.inc.php         |   4 +-
 html/includes/print-map.inc.php               |   6 +-
 html/includes/print-menubar.php               |  16 +-
 html/includes/reports/alert-log.pdf.inc.php   |   6 +-
 html/includes/table/address-search.inc.php    |   6 +-
 html/includes/table/alert-schedule.inc.php    |   6 +-
 html/includes/table/alertlog.inc.php          |   6 +-
 html/includes/table/alerts.inc.php            |   6 +-
 html/includes/table/arp-search.inc.php        |   6 +-
 html/includes/table/bills.inc.php             |   8 +-
 html/includes/table/devices.inc.php           |  10 +-
 html/includes/table/eventlog.inc.php          |   6 +-
 html/includes/table/fdb-search.inc.php        |   8 +-
 html/includes/table/inventory.inc.php         |   6 +-
 html/includes/table/mempool.inc.php           |   6 +-
 html/includes/table/poll-log.inc.php          |  10 +-
 html/includes/table/ports.inc.php             |  10 +-
 html/includes/table/processor.inc.php         |   6 +-
 html/includes/table/sensors-common.php        |   8 +-
 html/includes/table/storage.inc.php           |   6 +-
 html/includes/table/syslog.inc.php            |   6 +-
 html/includes/table/toner.inc.php             |   4 +-
 html/install.php                              |   8 +-
 html/legacy_index.php                         |  60 +----
 html/netcmd.php                               |   6 +-
 html/network-map.php                          |   6 +-
 html/pages/about.inc.php                      |  12 +-
 html/pages/addhost.inc.php                    |   6 +-
 html/pages/addsrv.inc.php                     |   6 +-
 html/pages/adduser.inc.php                    |  12 +-
 html/pages/alert-schedule.inc.php             |   4 +-
 html/pages/api-access.inc.php                 |   6 +-
 html/pages/authlog.inc.php                    |   4 +-
 html/pages/bill.inc.php                       |  12 +-
 html/pages/bills.inc.php                      |   6 +-
 html/pages/delhost.inc.php                    |   6 +-
 html/pages/deluser.inc.php                    |  18 +-
 html/pages/device-dependencies.inc.php        |   4 +-
 html/pages/device.inc.php                     |   8 +-
 html/pages/device/capture.inc.php             |   4 +-
 html/pages/device/edit.inc.php                |   4 +-
 html/pages/device/edit/alerts.inc.php         |   4 +-
 html/pages/device/edit/device.inc.php         |   6 +-
 html/pages/device/edit/ipmi.inc.php           |   4 +-
 html/pages/device/edit/services.inc.php       |   6 +-
 html/pages/device/edit/snmp.inc.php           |   4 +-
 html/pages/device/notes.inc.php               |   4 +-
 html/pages/device/performance.inc.php         |   6 +-
 html/pages/device/port.inc.php                |   4 +-
 html/pages/device/services.inc.php            |   6 +-
 html/pages/device/showconfig.inc.php          |   6 +-
 html/pages/devices.inc.php                    |   6 +-
 html/pages/edituser.inc.php                   |  22 +-
 html/pages/eventlog.inc.php                   |   4 +-
 html/pages/front/default.php                  |  28 +--
 html/pages/front/example2.php                 |   4 +-
 html/pages/front/globe.php                    |   6 +-
 html/pages/front/jt.php                       |   4 +-
 html/pages/front/map.php                      |   6 +-
 html/pages/front/tiles.php                    |  16 +-
 html/pages/front/traffic.php                  |   4 +-
 html/pages/locations.inc.php                  |  14 +-
 html/pages/logon.inc.php                      |  66 ------
 html/pages/notifications.inc.php              |  14 +-
 html/pages/plugin/admin.inc.php               |   4 +-
 html/pages/pollers/pollers.inc.php            |   9 +-
 html/pages/ports.inc.php                      |  22 +-
 html/pages/preferences.inc.php                | 114 +++-------
 html/pages/public.inc.php                     |  58 -----
 html/pages/routing/bgp.inc.php                |   4 +-
 html/pages/routing/vrf.inc.php                |  10 +-
 html/pages/search/arp.inc.php                 |   6 +-
 html/pages/search/fdb.inc.php                 |   6 +-
 html/pages/search/ipv4.inc.php                |   6 +-
 html/pages/search/ipv6.inc.php                |   6 +-
 html/pages/search/mac.inc.php                 |   6 +-
 html/pages/search/packages.inc.php            |   6 +-
 html/pages/services.inc.php                   |   8 +-
 html/pages/settings.inc.php                   |   6 +-
 html/pages/settings/alerting.inc.php          |   4 +-
 html/pages/syslog.inc.php                     |   4 +-
 html/pages/vminfo.inc.php                     |   2 -
 includes/alerts.inc.php                       |   6 +-
 includes/caches/alerts.inc.php                |   6 +-
 includes/caches/devices.inc.php               |  14 +-
 includes/caches/notifications.inc.php         |   8 +-
 includes/caches/ports.inc.php                 |  16 +-
 includes/caches/services.inc.php              |  14 +-
 includes/caches/toner.inc.php                 |   6 +-
 includes/common.php                           |   6 +-
 includes/defaults.inc.php                     |   2 -
 includes/functions.php                        |   4 +-
 includes/init.php                             |  27 ++-
 misc/db_schema.yaml                           |   4 +-
 resources/views/auth/2fa.blade.php            | 104 +++++++++
 .../views/auth/external-auth-failed.blade.php |  14 ++
 resources/views/auth/login-form.blade.php     |  53 +++++
 resources/views/auth/login.blade.php          |   9 +
 resources/views/auth/public-status.blade.php  |  86 +++++++
 resources/views/home.blade.php                |  23 ++
 resources/views/layouts/app.blade.php         |  80 +++++++
 resources/views/layouts/librenmsv1.blade.php  |  12 +-
 resources/views/layouts/menu.blade.php        |  20 +-
 routes/api.php                                |   7 +-
 routes/web.php                                |  83 ++++---
 scripts/auth_test.php                         |  57 ++---
 sql-schema/254.sql                            |   2 +-
 sql-schema/261.sql                            |   2 +-
 sql-schema/267.sql                            |   5 +
 tests/AuthHTTPTest.php                        |  12 +-
 tests/AuthSSOTest.php                         |  32 ++-
 tests/DBTestCase.php                          |   2 +-
 tests/bootstrap.php                           |   1 +
 tests/config/config.test.php                  |   1 -
 278 files changed, 2604 insertions(+), 1816 deletions(-)
 delete mode 100644 LibreNMS/Authentication/Auth.php
 create mode 100644 LibreNMS/Authentication/LegacyAuth.php
 create mode 100644 app/Guards/ApiTokenGuard.php
 create mode 100644 app/Http/Controllers/TwoFactorController.php
 create mode 100644 app/Http/Middleware/LegacyExternalAuth.php
 create mode 100644 app/Http/Middleware/VerifyTwoFactor.php
 create mode 100644 app/Http/ViewComposers/LayoutComposer.php
 create mode 100644 app/Listeners/AuthEventListener.php
 create mode 100644 app/Models/ApiToken.php
 create mode 100644 app/Models/UserPref.php
 create mode 100644 app/Models/UserWidget.php
 create mode 100644 app/Providers/LegacyUserProvider.php
 rename app/{Extensions/LegacyUserProvider.php => Providers/TokenUserProvider.php} (66%)
 delete mode 100644 html/includes/authenticate.inc.php
 delete mode 100644 html/includes/hostbox-public.inc.php
 delete mode 100644 html/pages/logon.inc.php
 delete mode 100644 html/pages/public.inc.php
 create mode 100644 resources/views/auth/2fa.blade.php
 create mode 100644 resources/views/auth/external-auth-failed.blade.php
 create mode 100644 resources/views/auth/login-form.blade.php
 create mode 100644 resources/views/auth/login.blade.php
 create mode 100644 resources/views/auth/public-status.blade.php
 create mode 100644 resources/views/home.blade.php
 create mode 100644 resources/views/layouts/app.blade.php
 create mode 100644 sql-schema/267.sql

diff --git a/LibreNMS/Authentication/ActiveDirectoryAuthorizer.php b/LibreNMS/Authentication/ActiveDirectoryAuthorizer.php
index 17a8484e06..dad1dc5c52 100644
--- a/LibreNMS/Authentication/ActiveDirectoryAuthorizer.php
+++ b/LibreNMS/Authentication/ActiveDirectoryAuthorizer.php
@@ -55,27 +55,6 @@ class ActiveDirectoryAuthorizer extends AuthorizerBase
         throw new AuthenticationException(ldap_error($this->ldap_connection));
     }
 
-    public function reauthenticate($sess_id, $token)
-    {
-        if ($this->bind(false, true)) {
-            $sess_id = clean($sess_id);
-            $token = clean($token);
-            list($username, $hash) = explode('|', $token);
-
-            if (!$this->userExists($username)) {
-                if (Config::get('auth_ad_debug', false)) {
-                    throw new AuthenticationException("$username is not a valid AD user");
-                }
-                throw new AuthenticationException();
-            }
-
-            return $this->checkRememberMe($sess_id, $token);
-        }
-
-        return false;
-    }
-
-
     protected function userInGroup($username, $groupname)
     {
         // check if user is member of the given group or nested groups
@@ -223,15 +202,6 @@ class ActiveDirectoryAuthorizer extends AuthorizerBase
         return array();
     }
 
-    public function deleteUser($userid)
-    {
-        dbDelete('bill_perms', '`user_id` =  ?', array($userid));
-        dbDelete('devices_perms', '`user_id` =  ?', array($userid));
-        dbDelete('ports_perms', '`user_id` =  ?', array($userid));
-        dbDelete('users_prefs', '`user_id` =  ?', array($userid));
-        return 0;
-    }
-
 
     public function getUserlist()
     {
diff --git a/LibreNMS/Authentication/Auth.php b/LibreNMS/Authentication/Auth.php
deleted file mode 100644
index acbd53e815..0000000000
--- a/LibreNMS/Authentication/Auth.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace LibreNMS\Authentication;
-
-use LibreNMS\Config;
-use LibreNMS\Interfaces\Authentication\Authorizer;
-
-class Auth
-{
-    protected static $_instance;
-
-    /**
-     * Gets the authorizer based on the config
-     *
-     * @return Authorizer
-     */
-    public static function get()
-    {
-        if (!static::$_instance) {
-            $configToClassMap = array(
-                'mysql' => 'LibreNMS\Authentication\MysqlAuthorizer',
-                'active_directory' => 'LibreNMS\Authentication\ActiveDirectoryAuthorizer',
-                'ldap' => 'LibreNMS\Authentication\LdapAuthorizer',
-                'radius' => 'LibreNMS\Authentication\RadiusAuthorizer',
-                'http-auth' => 'LibreNMS\Authentication\HttpAuthAuthorizer',
-                'ad-authorization' => 'LibreNMS\Authentication\ADAuthorizationAuthorizer',
-                'ldap-authorization' => 'LibreNMS\Authentication\LdapAuthorizationAuthorizer',
-                'sso' => 'LibreNMS\Authentication\SSOAuthorizer',
-            );
-
-            $auth_mechanism = Config::get('auth_mechanism');
-            if (!isset($configToClassMap[$auth_mechanism])) {
-                throw new \RuntimeException($auth_mechanism . ' not found as auth_mechanism');
-            }
-
-            static::$_instance = new $configToClassMap[$auth_mechanism]();
-        }
-        return static::$_instance;
-    }
-
-    /**
-     * Destroy the existing instance and get a new one - required for tests.
-     *
-     * @return Authorizer
-     */
-    public static function reset()
-    {
-        static::$_instance = null;
-        return static::get();
-    }
-
-    public static function check()
-    {
-        return static::get()->sessionAuthenticated();
-    }
-
-    public static function user()
-    {
-        return new UserProxy;
-    }
-    
-    public static function id()
-    {
-        return $_SESSION['user_id'];
-    }
-}
diff --git a/LibreNMS/Authentication/AuthorizerBase.php b/LibreNMS/Authentication/AuthorizerBase.php
index 24b3455f5b..5ddaeb9f6b 100644
--- a/LibreNMS/Authentication/AuthorizerBase.php
+++ b/LibreNMS/Authentication/AuthorizerBase.php
@@ -24,9 +24,8 @@
  */
 namespace LibreNMS\Authentication;
 
-use LibreNMS\Config;
 use LibreNMS\Interfaces\Authentication\Authorizer;
-use LibreNMS\Exceptions\AuthenticationException;
+use Session;
 
 abstract class AuthorizerBase implements Authorizer
 {
@@ -35,175 +34,6 @@ abstract class AuthorizerBase implements Authorizer
     protected static $CAN_UPDATE_PASSWORDS = 0;
     protected static $AUTH_IS_EXTERNAL = 0;
 
-    /**
-     * Log out the user, unset cookies, destroy the session
-     *
-     * @param string $message The logout message.
-     */
-    public function logOutUser($message = 'Logged Out')
-    {
-        global $auth_message;
-
-        dbInsert(array('user' => $_SESSION['username'], 'address' => get_client_ip(), 'result' => 'Logged Out'), 'authlog');
-
-        $this->clearRememberMe($_SESSION['username']);
-
-        unset($_SESSION['authenticated']);
-        session_destroy();
-
-        $auth_message = $message; // global variable used to display a message to the user
-    }
-
-    /**
-     * Log in the user and set up a few login tasks
-     * $_SESSION['username'] must be set prior to calling this function
-     * If twofactor authentication is enabled, it will be checked here.
-     *
-     * If everything goes well, $_SESSION['authenticated'] will be true after this function completes.
-     * @return bool If the user was successfully logged in.
-     * @throws AuthenticationException if anything failed why trying to log in
-     */
-    public function logInUser()
-    {
-        // set up variables, but don't override existing ones (ad anonymous bind can only get user_id at login)
-        if (!isset($_SESSION['userlevel'])) {
-            $_SESSION['userlevel'] = $this->getUserlevel($_SESSION['username']);
-        }
-
-        if (!isset($_SESSION['user_id'])) {
-            $_SESSION['user_id'] = $this->getUserid($_SESSION['username']);
-        }
-
-        // check for valid user_id
-        if ($_SESSION['user_id'] === false || $_SESSION['user_id'] < 0) {
-            throw new AuthenticationException('Invalid Credentials');
-        }
-
-        if (!$this->sessionAuthenticated()) {
-            // check twofactor
-            if (Config::get('twofactor') === true && !isset($_SESSION['twofactor'])) {
-                if (TwoFactor::showForm()) {
-                    return false; // not done yet, one more cycle to show the 2fa form
-                }
-            }
-
-            // if two factor isn't enabled or it has passed already ware are logged in
-            if (!Config::get('twofactor') || $_SESSION['twofactor']) {
-                $_SESSION['authenticated'] = true;
-                dbInsert(array('user' => $_SESSION['username'], 'address' => get_client_ip(), 'result' => 'Logged In'), 'authlog');
-            }
-        }
-
-        if ($this->sessionAuthenticated()) {
-            $this->setRememberMe();
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if the session is authenticated
-     *
-     * @return bool
-     */
-    public function sessionAuthenticated()
-    {
-        return isset($_SESSION['authenticated']) && $_SESSION['authenticated'];
-    }
-
-    /**
-     * Set or update the remember me cookie if $_SESSION['remember'] is set
-     * If setting a new cookie, $_SESSION['username'] must be set
-     */
-    protected function setRememberMe()
-    {
-        if (!isset($_SESSION['remember'])) {
-            return;
-        }
-        unset($_SESSION['remember']);
-
-        $sess_id = session_id();
-        $expiration = time() + 60 * 60 * 24 * Config::get('auth_remember');
-
-        $db_entry = array(
-            'session_value' => $sess_id,
-            'session_expiry' => $expiration,
-        );
-
-        if (isset($_COOKIE['token'], $_COOKIE['auth'])) {
-            $token_id = $_COOKIE['token'];
-            $auth = $_COOKIE['auth'];
-            dbUpdate($db_entry, 'session', 'session_auth=?', array($_COOKIE['auth']));
-        } else {
-            $token = strgen();
-            $auth = strgen();
-            $token_id = $_SESSION['username'] . '|' . password_hash($_SESSION['username'] . $token, PASSWORD_DEFAULT);
-
-            $db_entry['session_username'] = $_SESSION['username'];
-            $db_entry['session_token'] = $token;
-            $db_entry['session_auth'] = $auth;
-            dbInsert($db_entry, 'session');
-        }
-
-        setcookie('sess_id', $sess_id, $expiration, '/', null, Config::get('secure_cookies'), true);
-        setcookie('token', $token_id, $expiration, '/', null, Config::get('secure_cookies'), true);
-        setcookie('auth', $auth, $expiration, '/', null, Config::get('secure_cookies'), true);
-    }
-
-    /**
-     * Check the remember me cookie
-     * If the cookie is valid, $_SESSION['username'] will be set
-     *
-     * @param string $sess_id sess_id cookie value
-     * @param string $token token cookie value
-     * @return bool is the remember me token valid
-     * @throws AuthenticationException thrown if the cookie is invalid
-     */
-    protected function checkRememberMe($sess_id, $token)
-    {
-        list($uname, $hash) = explode('|', $token);
-        $session = dbFetchRow(
-            "SELECT * FROM `session` WHERE `session_username`=? AND `session_value`=?",
-            array($uname, $sess_id)
-        );
-
-        if (password_verify($uname . $session['session_token'], $hash)) {
-            $_SESSION['username'] = $uname;
-            return true;
-        }
-
-        $this->clearRememberMe($uname);
-        throw new AuthenticationException('Cookie invalid, please log in.');
-    }
-
-    /**
-     * Clear remember cookie and remove our database record
-     *
-     * @param $username
-     */
-    protected function clearRememberMe($username)
-    {
-        dbDelete(
-            'session',
-            '`session_username` =  ? AND `session_value` = ?',
-            array($username, $_COOKIE['sess_id'])
-        );
-
-        unset($_COOKIE);
-
-        $time = time() - 60 * 60 * 24 * Config::get('auth_remember'); // time in the past to make sure
-
-        setcookie('sess_id', '', $time, '/', null, Config::get('secure_cookies'));
-        setcookie('token', '', $time, '/', null, Config::get('secure_cookies'));
-        setcookie('auth', '', $time, '/', null, Config::get('secure_cookies'));
-    }
-
-    public function reauthenticate($sess_id, $token)
-    {
-        //not supported by default
-        return false;
-    }
-
     public function canUpdatePasswords($username = '')
     {
         return static::$CAN_UPDATE_PASSWORDS;
@@ -226,7 +56,7 @@ abstract class AuthorizerBase implements Authorizer
         return 0;
     }
 
-    public function deleteUser($userid)
+    public function deleteUser($user_id)
     {
         //not supported by default
         return 0;
@@ -251,9 +81,11 @@ abstract class AuthorizerBase implements Authorizer
     public function getExternalUsername()
     {
         if (isset($_SERVER['REMOTE_USER'])) {
-            return clean($_SERVER['REMOTE_USER']);
+            return $_SERVER['REMOTE_USER'];
         } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-            return clean($_SERVER['PHP_AUTH_USER']);
+            return $_SERVER['PHP_AUTH_USER'];
         }
+
+        return null;
     }
 }
diff --git a/LibreNMS/Authentication/LdapAuthorizer.php b/LibreNMS/Authentication/LdapAuthorizer.php
index 3d6ca3c2c3..fd62063285 100644
--- a/LibreNMS/Authentication/LdapAuthorizer.php
+++ b/LibreNMS/Authentication/LdapAuthorizer.php
@@ -53,21 +53,6 @@ class LdapAuthorizer extends AuthorizerBase
         throw new AuthenticationException();
     }
 
-
-    public function reauthenticate($sess_id, $token)
-    {
-        $sess_id = clean($sess_id);
-        $token = clean($token);
-
-        list($username, $hash) = explode('|', $token);
-
-        if (!$this->userExists($username, true)) {
-            throw new AuthenticationException();
-        }
-
-        return $this->checkRememberMe($sess_id, $token);
-    }
-
     public function userExists($username, $throw_exception = false)
     {
         try {
diff --git a/LibreNMS/Authentication/LegacyAuth.php b/LibreNMS/Authentication/LegacyAuth.php
new file mode 100644
index 0000000000..4dd5c21944
--- /dev/null
+++ b/LibreNMS/Authentication/LegacyAuth.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace LibreNMS\Authentication;
+
+use LibreNMS\Config;
+use LibreNMS\Interfaces\Authentication\Authorizer;
+
+class LegacyAuth
+{
+    protected static $_instance;
+    private static $configToClassMap = array(
+        'mysql' => 'LibreNMS\Authentication\MysqlAuthorizer',
+        'active_directory' => 'LibreNMS\Authentication\ActiveDirectoryAuthorizer',
+        'ldap' => 'LibreNMS\Authentication\LdapAuthorizer',
+        'radius' => 'LibreNMS\Authentication\RadiusAuthorizer',
+        'http-auth' => 'LibreNMS\Authentication\HttpAuthAuthorizer',
+        'ad-authorization' => 'LibreNMS\Authentication\ADAuthorizationAuthorizer',
+        'ldap-authorization' => 'LibreNMS\Authentication\LdapAuthorizationAuthorizer',
+        'sso' => 'LibreNMS\Authentication\SSOAuthorizer',
+    );
+
+    /**
+     * Gets the authorizer based on the config
+     *
+     * @return Authorizer
+     */
+    public static function get()
+    {
+        if (!static::$_instance) {
+            $class = self::getClass();
+            static::$_instance = new $class;
+        }
+        return static::$_instance;
+    }
+
+    /**
+     * The auth mechanism type.
+     *
+     * @return mixed
+     */
+    public static function getType()
+    {
+        return Config::get('auth_mechanism');
+    }
+
+    /**
+     * Get class for the given or current authentication type/mechanism
+     *
+     * @param string $type
+     * @return string
+     */
+    public static function getClass($type = null)
+    {
+        if (is_null($type)) {
+            $type = self::getType();
+        }
+
+        if (!isset(self::$configToClassMap[$type])) {
+            throw new \RuntimeException($type . ' not found as auth_mechanism');
+        }
+
+        return self::$configToClassMap[$type];
+    }
+
+    /**
+     * Destroy the existing instance and get a new one - required for tests.
+     *
+     * @return Authorizer
+     */
+    public static function reset()
+    {
+        static::$_instance = null;
+        return static::get();
+    }
+
+    public static function check()
+    {
+        self::checkInitSession();
+        return isset($_SESSION['authenticated']) && $_SESSION['authenticated'];
+    }
+
+    public static function user()
+    {
+        self::checkInitSession();
+        return new UserProxy();
+    }
+
+    public static function id()
+    {
+        self::checkInitSession();
+        return isset($_SESSION['user_id']) ? $_SESSION['user_id'] : 0;
+    }
+
+    protected static function checkInitSession()
+    {
+        if (!isset($_SESSION)) {
+            @session_start();
+            session_write_close();
+        }
+    }
+}
diff --git a/LibreNMS/Authentication/MysqlAuthorizer.php b/LibreNMS/Authentication/MysqlAuthorizer.php
index 3480f3dbda..c476fd394f 100644
--- a/LibreNMS/Authentication/MysqlAuthorizer.php
+++ b/LibreNMS/Authentication/MysqlAuthorizer.php
@@ -2,6 +2,10 @@
 
 namespace LibreNMS\Authentication;
 
+use App\Models\Notification;
+use App\Models\NotificationAttrib;
+use App\Models\User;
+use LibreNMS\DB\Eloquent;
 use LibreNMS\Exceptions\AuthenticationException;
 use Phpass\PasswordHash;
 
@@ -13,7 +17,7 @@ class MysqlAuthorizer extends AuthorizerBase
 
     public function authenticate($username, $password)
     {
-        $hash = dbFetchCell('SELECT `password` FROM `users` WHERE `username`= ?', array($username));
+        $hash = User::thisAuth()->where('username', $username)->value('password');
 
         // check for old passwords
         if (strlen($hash) == 32) {
@@ -44,11 +48,6 @@ class MysqlAuthorizer extends AuthorizerBase
         throw new AuthenticationException();
     }
 
-    public function reauthenticate($sess_id, $token)
-    {
-        return $this->checkRememberMe($sess_id, $token);
-    }
-
     public function canUpdatePasswords($username = '')
     {
         /*
@@ -61,7 +60,7 @@ class MysqlAuthorizer extends AuthorizerBase
         } elseif (empty($username) || !$this->userExists($username)) {
             return 1;
         } else {
-            return dbFetchCell('SELECT can_modify_passwd FROM users WHERE username = ?', array($username));
+            return User::thisAuth()->where('username', $username)->value('can_modify_passwd');
         }
     }
 
@@ -72,66 +71,115 @@ class MysqlAuthorizer extends AuthorizerBase
             return 0;
         }
 
-        $encrypted = password_hash($password, PASSWORD_DEFAULT);
-        return dbUpdate(array('password' => $encrypted), 'users', '`username` = ?', array($username));
+        /** @var User $user */
+        $user = User::thisAuth()->where('username', $username)->first();
+
+        if ($user) {
+            $user->password = password_hash($password, PASSWORD_DEFAULT);
+
+            return $user->save();
+        }
+
+        return false;
     }
 
-    public function addUser($username, $password, $level = 0, $email = '', $realname = '', $can_modify_passwd = 1, $description = '')
+    public function addUser($username, $password, $level = 0, $email = '', $realname = '', $can_modify_passwd = 1, $descr = '')
     {
-        if (!$this->userExists($username)) {
-            $encrypted = password_hash($password, PASSWORD_DEFAULT);
-            $userid = dbInsert(array('username' => $username, 'password' => $encrypted, 'level' => $level, 'email' => $email, 'realname' => $realname, 'can_modify_passwd' => $can_modify_passwd, 'descr' => $description), 'users');
-            if ($userid == false) {
-                return false;
-            } else {
-                foreach (dbFetchRows('select notifications.* from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?) order by notifications.notifications_id desc', array($userid)) as $notif) {
-                    dbInsert(array('notifications_id'=>$notif['notifications_id'],'user_id'=>$userid,'key'=>'read','value'=>1), 'notifications_attribs');
-                }
+        $user_array = get_defined_vars();
+
+        // no nulls
+        $user_array = array_filter($user_array, function ($field) {
+            return !is_null($field);
+        });
+
+        $new_user = User::thisAuth()->firstOrNew(['username' => $username], $user_array);
+
+        // only update new users
+        if (!$new_user->user_id) {
+            $new_user->auth_type = LegacyAuth::getType();
+            $new_user->password = password_hash($password, PASSWORD_DEFAULT);
+            $new_user->email = (string)$new_user->email;
+
+            $new_user->save();
+            $user_id = $new_user->user_id;
+
+            // set auth_id
+            $new_user->auth_id = $user_id;
+            $new_user->save();
+
+            if ($user_id) {
+                // mark pre-existing notifications as read
+                Notification::whereNotExists(function ($query) use ($user_id) {
+                    return $query->select(Eloquent::DB()->raw(1))
+                        ->from('notifications_attribs')
+                        ->whereRaw('notifications.notifications_id = notifications_attribs.notifications_id')
+                        ->where('notifications_attribs.user_id', $user_id);
+                })->get()->each(function ($notif) use ($user_id) {
+                    NotificationAttrib::create([
+                        'notifications_id' => $notif->notifications_id,
+                        'user_id' => $user_id,
+                        'key' => 'read',
+                        'value' => 1
+                    ]);
+                });
+
+                return $user_id;
             }
-            return $userid;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     public function userExists($username, $throw_exception = false)
     {
-        return (bool)dbFetchCell('SELECT COUNT(*) FROM users WHERE username = ?', array($username));
+        return User::thisAuth()->where('username', $username)->exists();
     }
 
     public function getUserlevel($username)
     {
-        return dbFetchCell('SELECT `level` FROM `users` WHERE `username` = ?', array($username));
+        return User::thisAuth()->where('username', $username)->value('level');
     }
 
     public function getUserid($username)
     {
-        return dbFetchCell('SELECT `user_id` FROM `users` WHERE `username` = ?', array($username));
+        // for mysql user_id == auth_id
+        return User::thisAuth()->where('username', $username)->value('user_id');
     }
 
-    public function deleteUser($userid)
+    public function deleteUser($user_id)
     {
-        dbDelete('bill_perms', '`user_id` =  ?', array($userid));
-        dbDelete('devices_perms', '`user_id` =  ?', array($userid));
-        dbDelete('ports_perms', '`user_id` =  ?', array($userid));
-        dbDelete('users_prefs', '`user_id` =  ?', array($userid));
-        dbDelete('users', '`user_id` =  ?', array($userid));
+        // could be used on cli, use Eloquent helper
+        Eloquent::DB()->table('bill_perms')->where('user_id', $user_id)->delete();
+        Eloquent::DB()->table('devices_perms')->where('user_id', $user_id)->delete();
+        Eloquent::DB()->table('ports_perms')->where('user_id', $user_id)->delete();
+        Eloquent::DB()->table('users_prefs')->where('user_id', $user_id)->delete();
 
-        return dbDelete('users', '`user_id` =  ?', array($userid));
+        return User::destroy($user_id);
     }
 
     public function getUserlist()
     {
-        return dbFetchRows('SELECT * FROM `users` ORDER BY `username`');
+        return User::thisAuth()->orderBy('username')->get()->toArray();
     }
 
     public function getUser($user_id)
     {
-        return dbFetchRow('SELECT * FROM `users` WHERE `user_id` = ?', array($user_id));
+        $user = User::find($user_id);
+        if ($user) {
+            return $user->toArray();
+        }
+        return null;
     }
 
     public function updateUser($user_id, $realname, $level, $can_modify_passwd, $email)
     {
-        dbUpdate(array('realname' => $realname, 'level' => $level, 'can_modify_passwd' => $can_modify_passwd, 'email' => $email), 'users', '`user_id` = ?', array($user_id));
+        $user = User::find($user_id);
+
+        $user->realname = $realname;
+        $user->level = (int)$level;
+        $user->can_modify_passwd = (int)$can_modify_passwd;
+        $user->email = $email;
+
+        $user->save();
     }
 }
diff --git a/LibreNMS/Authentication/TwoFactor.php b/LibreNMS/Authentication/TwoFactor.php
index 667d37695a..564264fc02 100644
--- a/LibreNMS/Authentication/TwoFactor.php
+++ b/LibreNMS/Authentication/TwoFactor.php
@@ -30,6 +30,7 @@ namespace LibreNMS\Authentication;
 
 use LibreNMS\Config;
 use LibreNMS\Exceptions\AuthenticationException;
+use Session;
 
 class TwoFactor
 {
@@ -123,127 +124,6 @@ class TwoFactor
         return $ret;
     }
 
-    /**
-     * Return the HTML for the TwoFactor Input-Form
-     * @param boolean $form_tags Include FORM-tags
-     * @return string
-     */
-    public static function getForm($form_tags = true)
-    {
-        $ret = '';
-
-        if ($form_tags) {
-            $ret .= '
-      <div class="row">
-        <div class="col-md-offset-4 col-md-4">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">
-                <img class="img-responsive" src="' . Config::get('title_image') . '">
-              </h3>
-            </div>
-            <div class="panel-body">
-              <div class="container-fluid">
-                  <form class="form-horizontal" role="form" action="" method="post" name="twofactorform">';
-        }
-
-        $ret .= '
-        <div class="form-group">
-          <div class="col-md-12">
-            <input type="text" name="twofactor" id="twofactor" class="form-control" autocomplete="off" placeholder="Please enter auth token" />
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="col-md-12">
-            <button type="submit" class="btn btn-default btn-block" name="submit">Submit</button>
-          </div>
-         </div>
-        </div>';
-
-        $ret .= '<script>document.twofactorform.twofactor.focus();</script>';
-
-        if ($form_tags) {
-            $ret .= '</form>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Authenticate with two factor
-     * Will set $twofactorform if the token hasn't been requested yet (page will redirect to the logon page)
-     *
-     * @return bool returns false if the form is not needed
-     * @throws AuthenticationException
-     */
-    public static function showForm()
-    {
-        global $twofactorform;
-
-        $twofactor = get_user_pref('twofactor');
-
-        // no need to show the form, user doesn't have a token
-        if (empty($twofactor)) {
-            $_SESSION['twofactor'] = true;
-            return false;
-        }
-
-        // lockout the user if there are too many failures
-        if ($twofactor['fails'] >= 3) {
-            if (!Config::get('twofactor_lock')) {
-                throw new AuthenticationException('Too many two-factor failures, please contact administrator.');
-            } elseif ((time() - $twofactor['last']) < Config::get('twofactor_lock')) {
-                $msg = "Too many two-factor failures, please wait " . Config::get('twofactor_lock') . " seconds";
-                throw new AuthenticationException($msg);
-            }
-        }
-
-        // set $twofactorform to show the form in logon.inc.php
-        $twofactorform = true;
-        return true;
-    }
-
-    /**
-     * Check a 2fa token this will be stored in $_POST['twofactor'] by the form
-     * If valid,  $_SESSION['twofactor'] = true will be set and this will return true
-     *
-     * @param string $token The 2fa token, stored in $_POST['twofactor'] by the form
-     * @return bool If the token was valid
-     * @throws AuthenticationException Thrown if the token was invalid
-     */
-    public static function authenticate($token)
-    {
-        if (!$token) {
-            throw new AuthenticationException("No Two-Factor Token entered.");
-        }
-
-        $twofactor = get_user_pref('twofactor');
-
-        if (empty($twofactor)) {
-            throw new AuthenticationException('No Two-Factor settings, how did you get here?');
-        }
-
-        if (($server_c = self::verifyHOTP($twofactor['key'], $_POST['twofactor'], $twofactor['counter'])) === false) {
-            $twofactor['fails']++;
-            $twofactor['last'] = time();
-            set_user_pref('twofactor', $twofactor);
-            throw new AuthenticationException("Wrong Two-Factor Token.");
-        }
-
-        if ($twofactor['counter'] !== false) {
-            if ($server_c !== true && $server_c !== $twofactor['counter']) {
-                $twofactor['counter'] = $server_c + 1;
-            } else {
-                $twofactor['counter']++;
-            }
-        }
-        $twofactor['fails'] = 0;
-        set_user_pref('twofactor', $twofactor);
-
-        $_SESSION['twofactor'] = true;
-        return true;
-    }
-
     /**
      * Verify HOTP token honouring window
      *
diff --git a/LibreNMS/IRCBot.php b/LibreNMS/IRCBot.php
index 1ed2895daf..e864ac5286 100644
--- a/LibreNMS/IRCBot.php
+++ b/LibreNMS/IRCBot.php
@@ -20,8 +20,8 @@
 
 namespace LibreNMS;
 
-use LibreNMS\Authentication\Auth;
 use LibreNMS\DB\Eloquent;
+use LibreNMS\Authentication\LegacyAuth;
 
 class IRCBot
 {
@@ -539,11 +539,11 @@ class IRCBot
             foreach ($hosts as $host) {
                 $host = preg_replace("/\*/", ".*", $host);
                 if (preg_match("/$host/", $this->getUserHost($this->data))) {
-                    $user_id = Auth::get()->getUserid(mres($nms_user));
-                    $user = Auth::get()->getUser($user_id);
+                    $user_id = LegacyAuth::get()->getUserid(mres($nms_user));
+                    $user = LegacyAuth::get()->getUser($user_id);
                     $this->user['name'] = $user['username'];
                     $this->user['id']   = $user_id;
-                    $this->user['level'] = Auth::get()->getUserlevel($user['username']);
+                    $this->user['level'] = LegacyAuth::get()->getUserlevel($user['username']);
                     $this->user['expire'] = (time() + ($this->config['irc_authtime'] * 3600));
                     if ($this->user['level'] < 5) {
                         foreach (dbFetchRows('SELECT device_id FROM devices_perms WHERE user_id = ?', array($this->user['id'])) as $tmp) {
@@ -578,8 +578,8 @@ class IRCBot
         if (strlen($params[0]) == 64) {
             if ($this->tokens[$this->getUser($this->data)] == $params[0]) {
                 $this->user['expire'] = (time() + ($this->config['irc_authtime'] * 3600));
-                $tmp_user = Auth::get()->getUser($this->user['id']);
-                $tmp = Auth::get()->getUserlevel($tmp_user['username']);
+                $tmp_user = LegacyAuth::get()->getUser($this->user['id']);
+                $tmp = LegacyAuth::get()->getUserlevel($tmp_user['username']);
                 $this->user['level'] = $tmp;
                 if ($this->user['level'] < 5) {
                     foreach (dbFetchRows('SELECT device_id FROM devices_perms WHERE user_id = ?', array($this->user['id'])) as $tmp) {
@@ -596,8 +596,8 @@ class IRCBot
                 return $this->respond('Nope.');
             }
         } else {
-            $user_id = Auth::get()->getUserid(mres($params[0]));
-            $user = Auth::get()->getUser($user_id);
+            $user_id = LegacyAuth::get()->getUserid(mres($params[0]));
+            $user = LegacyAuth::get()->getUser($user_id);
             if ($user['email'] && $user['username'] == $params[0]) {
                 $token = hash('gost', openssl_random_pseudo_bytes(1024));
                 $this->tokens[$this->getUser($this->data)] = $token;
diff --git a/LibreNMS/Interfaces/Authentication/Authorizer.php b/LibreNMS/Interfaces/Authentication/Authorizer.php
index 728bc9c6b9..de8b9b4feb 100644
--- a/LibreNMS/Interfaces/Authentication/Authorizer.php
+++ b/LibreNMS/Interfaces/Authentication/Authorizer.php
@@ -17,17 +17,6 @@ interface Authorizer
      */
     public function authenticate($username, $password);
 
-    /**
-     * Check for cookie token to see if this is a valid saved session
-     * Authorizers should check if the user is still valid then return checkRememberMe()
-     *
-     * @param int $sess_id
-     * @param string $token
-     * @return bool
-     * @throws AuthenticationException thrown if the cookie or user is invalid
-     */
-    public function reauthenticate($sess_id, $token);
-
     /**
      * Check if a $username exists.
      *
@@ -143,31 +132,6 @@ interface Authorizer
      */
     public function canUpdatePasswords($username = '');
 
-    /**
-     * Log out the user, unset cookies, destroy the session
-     *
-     * @param string $message The logout message.
-     */
-    public function logOutUser($message = 'Logged Out');
-
-    /**
-     * Log in the user and set up a few login tasks
-     * $_SESSION['username'] must be set prior to calling this function
-     * If twofactor authentication is enabled, it will be checked here.
-     *
-     * If everything goes well, $_SESSION['authenticated'] will be true after this function completes.
-     * @return bool If the user was successfully logged in.
-     * @throws AuthenticationException if anything failed why trying to log in
-     */
-    public function logInUser();
-
-    /**
-     * Check if the session is authenticated
-     *
-     * @return bool
-     */
-    public function sessionAuthenticated();
-
     /**
      * Indicates if the authentication happens within the LibreNMS process, or external to it.
      * If the former, LibreNMS provides a login form, and the user must supply the username. If the latter, the authenticator supplies it via getExternalUsername() without user interaction.
diff --git a/LibreNMS/ObjectCache.php b/LibreNMS/ObjectCache.php
index 909d1d8e7d..f964b2e3eb 100644
--- a/LibreNMS/ObjectCache.php
+++ b/LibreNMS/ObjectCache.php
@@ -114,7 +114,7 @@ class ObjectCache implements ArrayAccess
      */
     public function offsetSet($obj, $value)
     {
-        if (!is_array($this->data[$obj])) {
+        if (!isset($this->data[$obj])) {
             $this->data[$obj] = array();
         }
 
diff --git a/adduser.php b/adduser.php
index c7e8d8849c..b45b0310f1 100755
--- a/adduser.php
+++ b/adduser.php
@@ -12,7 +12,7 @@
  *
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array();
 if (php_sapi_name() != 'cli') {
@@ -20,10 +20,10 @@ if (php_sapi_name() != 'cli') {
 }
 require __DIR__ . '/includes/init.php';
 
-if (Auth::get()->canManageUsers()) {
+if (LegacyAuth::get()->canManageUsers()) {
     if (isset($argv[1]) && isset($argv[2]) && isset($argv[3])) {
-        if (!Auth::get()->userExists($argv[1])) {
-            if (Auth::get()->addUser($argv[1], $argv[2], $argv[3], @$argv[4])) {
+        if (!LegacyAuth::get()->userExists($argv[1])) {
+            if (LegacyAuth::get()->addUser($argv[1], $argv[2], $argv[3], @$argv[4])) {
                 echo 'User '.$argv[1]." added successfully\n";
             }
         } else {
diff --git a/app/Checks.php b/app/Checks.php
index 83ae73e199..ad20adc363 100644
--- a/app/Checks.php
+++ b/app/Checks.php
@@ -28,9 +28,10 @@ namespace App;
 use App\Models\Device;
 use App\Models\Notification;
 use Auth;
+use Cache;
 use Carbon\Carbon;
 use Dotenv\Dotenv;
-use Kamaln7\Toastr\Facades\Toastr;
+use Toastr;
 use LibreNMS\Config;
 
 class Checks
@@ -150,26 +151,37 @@ class Checks
      */
     public static function postAuth()
     {
-        $notifications = Notification::isUnread(Auth::user())->where('severity', '>', 1)->get();
-        foreach ($notifications as $notification) {
-            Toastr::error("<a href='notifications/'>$notification->body</a>", $notification->title);
+        // limit popup messages frequency
+        if (Cache::get('checks_popup_timeout') || !Auth::check()) {
+            return;
         }
 
-        if (Device::isUp()->whereTime('last_polled', '<=', Carbon::now()->subMinutes(15))->count() > 0) {
-            Toastr::warning('<a href="poll-log/filter=unpolled/">It appears as though you have some devices that haven\'t completed polling within the last 15 minutes, you may want to check that out :)</a>', 'Devices unpolled');
-        }
+        Cache::put('checks_popup_timeout', true, Config::get('checks_popup_timer', 5));
 
-        // Directory access checks
-        $rrd_dir = Config::get('rrd_dir');
-        if (!is_dir($rrd_dir)) {
-            Toastr::error("RRD Directory is missing ($rrd_dir).  Graphing may fail.");
-        }
+        $user = Auth::user();
 
-        $temp_dir = Config::get('temp_dir');
-        if (!is_dir($temp_dir)) {
-            Toastr::error("Temp Directory is missing ($temp_dir).  Graphing may fail.");
-        } elseif (!is_writable($temp_dir)) {
-            Toastr::error("Temp Directory is not writable ($temp_dir).  Graphing may fail.");
+        if ($user->isAdmin()) {
+            $notifications = Notification::isUnread($user)->where('severity', '>', 1)->get();
+            foreach ($notifications as $notification) {
+                Toastr::error("<a href='notifications/'>$notification->body</a>", $notification->title);
+            }
+
+            if (Device::isUp()->whereTime('last_polled', '<=', Carbon::now()->subMinutes(15))->count() > 0) {
+                Toastr::warning('<a href="poll-log/filter=unpolled/">It appears as though you have some devices that haven\'t completed polling within the last 15 minutes, you may want to check that out :)</a>', 'Devices unpolled');
+            }
+
+            // Directory access checks
+            $rrd_dir = Config::get('rrd_dir');
+            if (!is_dir($rrd_dir)) {
+                Toastr::error("RRD Directory is missing ($rrd_dir).  Graphing may fail. <a href=" . url('validate') . ">Validate your install</a>");
+            }
+
+            $temp_dir = Config::get('temp_dir');
+            if (!is_dir($temp_dir)) {
+                Toastr::error("Temp Directory is missing ($temp_dir).  Graphing may fail. <a href=" . url('validate') . ">Validate your install</a>");
+            } elseif (!is_writable($temp_dir)) {
+                Toastr::error("Temp Directory is not writable ($temp_dir).  Graphing may fail. <a href='" . url('validate') . "'>Validate your install</a>");
+            }
         }
     }
 
diff --git a/app/Guards/ApiTokenGuard.php b/app/Guards/ApiTokenGuard.php
new file mode 100644
index 0000000000..592b3c1bb9
--- /dev/null
+++ b/app/Guards/ApiTokenGuard.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * ApiTokenGuard.php
+ *
+ * Override TokenGuard so we can use our non-standard header
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Guards;
+
+use Illuminate\Auth\TokenGuard;
+
+class ApiTokenGuard extends TokenGuard
+{
+    /**
+     * Get the token for the current request.
+     *
+     * @return string
+     */
+    public function getTokenForRequest()
+    {
+        $token = $this->request->header('X-Auth-Token');
+
+        if (empty($token)) {
+            $token = parent::getTokenForRequest();
+        }
+
+        return $token;
+    }
+}
diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index de1f344e8c..72b355cf71 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -6,6 +6,8 @@ use Illuminate\Http\Request;
 
 class AjaxController extends Controller
 {
+    // FIXME do not just pile functions on this controller, create separate controllers
+
     public function setResolution(Request $request)
     {
         $this->validate($request, [
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b2ea669a0d..05764e9c27 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -3,7 +3,9 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\Device;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use LibreNMS\Config;
 
 class LoginController extends Controller
 {
@@ -25,7 +27,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -36,4 +38,18 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+    public function username()
+    {
+        return 'username';
+    }
+
+    public function showLoginForm()
+    {
+        if (Config::get('public_status')) {
+            $devices = Device::isActive()->get();
+            return view('auth.public-status')->with('devices', $devices);
+        }
+        return view('auth.login');
+    }
 }
diff --git a/app/Http/Controllers/LegacyController.php b/app/Http/Controllers/LegacyController.php
index a5b3ff849e..97d904115d 100644
--- a/app/Http/Controllers/LegacyController.php
+++ b/app/Http/Controllers/LegacyController.php
@@ -2,10 +2,14 @@
 
 namespace App\Http\Controllers;
 
+use App\Checks;
+
 class LegacyController extends Controller
 {
     public function index($path = '')
     {
+        Checks::postAuth();
+
         ob_start();
         include base_path('html/legacy_index.php');
         $html = ob_get_clean();
diff --git a/app/Http/Controllers/TwoFactorController.php b/app/Http/Controllers/TwoFactorController.php
new file mode 100644
index 0000000000..7963db2688
--- /dev/null
+++ b/app/Http/Controllers/TwoFactorController.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\User;
+use App\Models\UserPref;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use LibreNMS\Authentication\TwoFactor;
+use LibreNMS\Config;
+use LibreNMS\Exceptions\AuthenticationException;
+use Session;
+use Toastr;
+
+class TwoFactorController extends Controller
+{
+    public function verifyTwoFactor(Request $request)
+    {
+        $this->validate($request, [
+            'twofactor' => 'required|numeric',
+        ]);
+
+        try {
+            $this->checkToken($request->user(), $request->input('twofactor'));
+        } catch (AuthenticationException $e) {
+            return redirect()->route('2fa.form')->withErrors($e->getMessage());
+        }
+
+        // token validated
+        if (session('twofactorremove')) {
+            UserPref::forgetPref(auth()->user(), 'twofactor');
+            $request->session()->forget(['twofactor', 'twofactorremove']);
+
+            \Toastr::info(__('TwoFactor auth removed.'));
+
+            return redirect('preferences');
+        }
+
+        $request->session()->put('twofactor', true);
+
+        return redirect()->intended();
+    }
+
+    public function showTwoFactorForm(Request $request)
+    {
+        $twoFactorSettings = $this->loadSettings($request->user());
+
+        // don't allow visiting this page if not needed
+        if (empty($twoFactorSettings) || !Config::get('twofactor') || session('twofactor')) {
+            return redirect()->intended();
+        }
+
+        $errors = [];
+
+        // lockout the user if there are too many failures
+        if (isset($twoFactorSettings['fails']) && $twoFactorSettings['fails'] >= 3) {
+            $lockout_time = Config::get('twofactor_lock', 0);
+
+            if (!$lockout_time) {
+                $errors['lockout'] = __('Too many two-factor failures, please contact administrator.');
+            } elseif ((time() - $twoFactorSettings['last']) < $lockout_time) {
+                $errors['lockout'] = __("Too many two-factor failures, please wait :time seconds", ['time' => $lockout_time]);
+            }
+        }
+
+        return view('auth.2fa')->with([
+            'key' => $twoFactorSettings['key'],
+            'uri' => $this->genUri($request->user(), $twoFactorSettings),
+        ])->withErrors($errors);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create(Request $request)
+    {
+        $this->validate($request, [
+            'twofactor' => Rule::in('time', 'counter')
+        ]);
+
+        $key = \LibreNMS\Authentication\TwoFactor::genKey();
+
+        // assume time based
+        $settings = [
+            'key' => $key,
+            'fails' => 0,
+            'last' => 0,
+            'counter' => $request->get('twofactor') == 'counter' ? 0 : false,
+        ];
+
+        Session::put('twofactoradd', $settings);
+
+        return redirect()->intended();
+    }
+
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Request $request)
+    {
+        $request->session()->put('twofactorremove', true);
+        $request->session()->forget('twofactor');
+
+        return redirect()->intended();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function cancelAdd(Request $request)
+    {
+        $request->session()->forget('twofactoradd');
+
+        return redirect()->intended();
+    }
+
+    /**
+     * @param User $user
+     * @param string $token
+     * @throws AuthenticationException
+     * return true
+     */
+    private function checkToken($user, $token)
+    {
+        if (!$token) {
+            throw new AuthenticationException(__("No Two-Factor Token entered."));
+        }
+
+        // check if this is new
+        $twoFactorSettings = $this->loadSettings($user);
+
+        if (empty($twoFactorSettings)) {
+            throw new AuthenticationException(__('No Two-Factor settings, how did you get here?'));
+        }
+
+        if (($server_count = TwoFactor::verifyHOTP($twoFactorSettings['key'], $token, $twoFactorSettings['counter'])) === false) {
+            if (isset($twoFactorSettings['fails'])) {
+                $twoFactorSettings['fails']++;
+            } else {
+                $twoFactorSettings['fails'] = 1;
+            }
+            $twoFactorSettings['last'] = time();
+            UserPref::setPref($user, 'twofactor', $twoFactorSettings);
+            throw new AuthenticationException(__("Wrong Two-Factor Token."));
+        }
+
+        // update counter
+        if ($twoFactorSettings['counter'] !== false) {
+            if ($server_count !== true && $server_count !== $twoFactorSettings['counter']) {
+                $twoFactorSettings['counter'] = $server_count + 1;
+            } else {
+                $twoFactorSettings['counter']++;
+            }
+        }
+
+        // success
+        $twoFactorSettings['fails'] = 0;
+        UserPref::setPref($user, 'twofactor', $twoFactorSettings);
+
+        // notify if added
+        if (Session::has('twofactoradd')) {
+            Toastr::success(__('TwoFactor auth added.'));
+            Session::forget('twofactoradd');
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $user
+     * @return mixed
+     */
+    private function loadSettings($user)
+    {
+        if (Session::has('twofactoradd')) {
+            return  Session::get('twofactoradd');
+        }
+
+        return UserPref::getPref($user, 'twofactor');
+    }
+
+    private function genUri($user, $settings)
+    {
+        $title = urlencode("Librenms:" . $user->username);
+        $key = $settings['key'];
+
+        // time based
+        if ($settings['counter'] === false) {
+            return "otpauth://totp/$title?issuer=LibreNMS&secret=$key";
+        }
+
+        // counter based
+        return "otpauth://hotp/$title?issuer=LibreNMS&counter=1&secret=$key";
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index b112277b85..849adac104 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -34,12 +34,14 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
+            \App\Http\Middleware\LegacyExternalAuth::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
             'throttle:60,1',
             'bindings',
+            'auth:token'
         ],
     ];
 
@@ -52,6 +54,7 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        '2fa' => \App\Http\Middleware\VerifyTwoFactor::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
diff --git a/app/Http/Middleware/LegacyExternalAuth.php b/app/Http/Middleware/LegacyExternalAuth.php
new file mode 100644
index 0000000000..36c3ce3a10
--- /dev/null
+++ b/app/Http/Middleware/LegacyExternalAuth.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\User;
+use Auth;
+use Closure;
+use LibreNMS\Authentication\LegacyAuth;
+use LibreNMS\Config;
+use LibreNMS\Exceptions\AuthenticationException;
+use Log;
+
+class LegacyExternalAuth
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (!Auth::check() && LegacyAuth::get()->authIsExternal()) {
+            try {
+                $username = LegacyAuth::get()->getExternalUsername();
+                $password = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
+
+                if (LegacyAuth::get()->authenticate($username, $password)) {
+                    $user_id = User::thisAuth()->where('username', $username)->value('user_id');
+                     Auth::loginUsingId($user_id);
+                }
+            } catch (AuthenticationException $e) {
+                $message = $e->getMessage();
+                Log::critical('HTTP Auth Error: ' . $message);
+
+                if (!Config::get('auth.debug', false)) {
+                    $message = '';
+                }
+
+                // force user to failure page
+                return response(view('auth.external-auth-failed')->with('message', $message));
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e4cec9c8b1..e27860e24e 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect('/');
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/VerifyTwoFactor.php b/app/Http/Middleware/VerifyTwoFactor.php
new file mode 100644
index 0000000000..011dc6c0e3
--- /dev/null
+++ b/app/Http/Middleware/VerifyTwoFactor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\UserPref;
+use Closure;
+use LibreNMS\Config;
+
+class VerifyTwoFactor
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // check twofactor
+        if (Config::get('twofactor') === true) {
+            // don't apply on 2fa checking routes
+            if (starts_with($request->route()->getName(), '2fa.')) {
+                return $next($request);
+            }
+
+            $twofactor = $request->session()->get('twofactoradd', UserPref::getPref($request->user(), 'twofactor'));
+
+            if (!empty($twofactor)) {
+                // user has 2fa enabled
+                if (!$request->session()->get('twofactor')) {
+                    // verification is needed
+                    return redirect('/2fa');
+                }
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/ViewComposers/LayoutComposer.php b/app/Http/ViewComposers/LayoutComposer.php
new file mode 100644
index 0000000000..334bb338ce
--- /dev/null
+++ b/app/Http/ViewComposers/LayoutComposer.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * LayoutComposer.php
+ *
+ * Provides data for the main layout
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Http\ViewComposers;
+
+use App\Checks;
+use App\Models\UserPref;
+use Illuminate\View\View;
+use LibreNMS\Config;
+
+class LayoutComposer
+{
+    /**
+     * Bind data to the view.
+     *
+     * @param  View $view
+     * @return void
+     */
+    public function compose(View $view)
+    {
+        // build page title
+        if ($view->getFactory()->hasSection('title')) {
+            $title = str_replace('    ', ' : ', trim($view->getFactory()->getSection('title')));
+            $title .= ' | ' . Config::get('page_title_suffix');
+        } else {
+            $title = Config::get('page_title_suffix');
+        }
+
+        Checks::postAuth();
+
+        $show_menu = auth()->check();
+        if ($show_menu && Config::get('twofactor') && !session('twofactor')) {
+             $show_menu = empty(UserPref::getPref(auth()->user(), 'twofactor'));
+        }
+
+        $view->with('pagetitle', $title)
+        ->with('show_menu', $show_menu);
+    }
+}
diff --git a/app/Http/ViewComposers/MenuComposer.php b/app/Http/ViewComposers/MenuComposer.php
index e4316319ca..358961b035 100644
--- a/app/Http/ViewComposers/MenuComposer.php
+++ b/app/Http/ViewComposers/MenuComposer.php
@@ -2,7 +2,7 @@
 /**
  * Menu.php
  *
- * -Description-
+ * Builds data for LibreNMS menu
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/Listeners/AuthEventListener.php b/app/Listeners/AuthEventListener.php
new file mode 100644
index 0000000000..9d8173967f
--- /dev/null
+++ b/app/Listeners/AuthEventListener.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Checks;
+use App\Events\Event;
+use App\Models\User;
+use DB;
+use Illuminate\Auth\Events\Login;
+use Illuminate\Auth\Events\Logout;
+use Request;
+use Session;
+use Toastr;
+
+class AuthEventListener
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the login event.
+     *
+     * @param Login $event
+     * @return void
+     */
+    public function login(Login $event)
+    {
+        /** @var User $user */
+        $user = $event->user;
+
+        DB::table('authlog')->insert(['user' => $user->username ?: '', 'address' => Request::ip(), 'result' => 'Logged In']);
+
+        Toastr::info('Welcome ' . ($user->realname ?: $user->username));
+
+        // Authenticated, set up legacy session stuff.  TODO Remove once ajax and graphs are ported to Laravel.
+        session_start();
+        $_SESSION['username'] = $user->username;
+
+        // set up legacy variables, but don't override existing ones (ad anonymous bind can only get user_id at login)
+        if (!isset($_SESSION['userlevel'])) {
+            $_SESSION['userlevel'] = $user->level;
+        }
+
+        if (!isset($_SESSION['user_id'])) {
+            $_SESSION['user_id'] = $user->user_id;
+        }
+
+        $_SESSION['authenticated'] = true;
+        session_write_close();
+    }
+
+    /**
+     * Handle the logout event.
+     *
+     * @param Logout $event
+     * @return void
+     */
+    public function logout(Logout $event)
+    {
+        DB::table('authlog')->insert(['user' => $event->user->username ?: '', 'address' => Request::ip(), 'result' => 'Logged Out']);
+
+        if (!isset($_SESSION)) {
+            session_start();
+        }
+        unset($_SESSION['authenticated']);
+        session_destroy();
+    }
+}
diff --git a/app/Models/ApiToken.php b/app/Models/ApiToken.php
new file mode 100644
index 0000000000..9b300c6517
--- /dev/null
+++ b/app/Models/ApiToken.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * ApiToken.php
+ *
+ * api_tokens simple tokens for api
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Models;
+
+class ApiToken extends BaseModel
+{
+    public $timestamps = false;
+    protected $table = 'api_tokens';
+
+    // ---- Helper Functions ----
+
+    /**
+     * Check if the given token is valid
+     *
+     * @param string $token
+     * @return bool
+     */
+    public static function isValid($token, $user_id = null)
+    {
+        $query = self::query()->isEnabled()->where('token_hash', $token);
+
+        if (!is_null($user_id)) {
+            $query->where('user_id', $user_id);
+        }
+
+        return $query->exists();
+    }
+
+    /**
+     * Get User model based on the given API token (or null if invalid)
+     *
+     * @param string $token
+     * @return User|null
+     */
+    public static function userFromToken($token)
+    {
+        return User::find(self::idFromToken($token));
+    }
+
+    /**
+     * Get the user_id for the given token.
+     *
+     * @param string $token
+     * @return int
+     */
+    public static function idFromToken($token)
+    {
+        return self::query()->isEnabled()->where('token_hash', $token)->value('user_id');
+    }
+
+    // ---- Query scopes ----
+
+    public function scopeIsEnabled($query)
+    {
+        return $query->where('disabled', 0);
+    }
+
+    // ---- Define Relationships ----
+
+    public function user()
+    {
+        return $this->belongsTo('App\Models\User', 'user_id');
+    }
+}
diff --git a/app/Models/Dashboard.php b/app/Models/Dashboard.php
index 137ff371fe..9296e91c82 100644
--- a/app/Models/Dashboard.php
+++ b/app/Models/Dashboard.php
@@ -39,6 +39,6 @@ class Dashboard extends Model
      */
     public function widgets()
     {
-        return $this->hasMany('App\Models\UsersWidgets', 'dashboard_id');
+        return $this->hasMany('App\Models\UserWidget', 'dashboard_id');
     }
 }
diff --git a/app/Models/Device.php b/app/Models/Device.php
index 92d9b0fe8d..7b85c31f89 100644
--- a/app/Models/Device.php
+++ b/app/Models/Device.php
@@ -135,6 +135,53 @@ class Device extends BaseModel
         return null;
     }
 
+    /**
+     * Get the display name of this device (hostname) unless force_ip_to_sysname is set
+     * and hostname is an IP and sysName is set
+     *
+     * @return string
+     */
+    public function displayName()
+    {
+        if (\LibreNMS\Config::get('force_ip_to_sysname') && $this->sysName && IP::isValid($this->hostname)) {
+            return $this->sysName;
+        }
+
+        return $this->hostname;
+    }
+
+    public function formatUptime($short = false)
+    {
+        $result = '';
+        $interval = $this->uptime;
+        $data = [
+            'years' => 31536000,
+            'days' => 86400,
+            'hours' => 3600,
+            'minutes' => 60,
+            'seconds' => 1,
+        ];
+
+        foreach ($data as $k => $v) {
+            if ($interval >= $v) {
+                $diff = floor($interval / $v);
+
+                $result .= " $diff";
+                if ($short) {
+                    $result .= substr($k, 0, 1);
+                } elseif ($diff > 1) {
+                    $result .= $k;
+                } else {
+                    $result .= substr($k, 0, -1);
+                }
+
+                $interval -= $v * $diff;
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * @return string
      */
@@ -224,6 +271,7 @@ class Device extends BaseModel
     }
 
     // ---- Accessors/Mutators ----
+
     public function getIconAttribute($icon)
     {
         if (isset($icon)) {
diff --git a/app/Models/NotificationAttrib.php b/app/Models/NotificationAttrib.php
index 09b1e135b0..5d3c1b0128 100644
--- a/app/Models/NotificationAttrib.php
+++ b/app/Models/NotificationAttrib.php
@@ -6,25 +6,10 @@ use Illuminate\Database\Eloquent\Model;
 
 class NotificationAttrib extends Model
 {
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
     public $timestamps = false;
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
     protected $table = 'notifications_attribs';
-    /**
-     * The primary key column name.
-     *
-     * @var string
-     */
     protected $primaryKey = 'attrib_id';
+    protected $fillable = ['notifications_id', 'user_id', 'key', 'value'];
 
     // ---- Define Relationships ----
 
diff --git a/app/Models/User.php b/app/Models/User.php
index b2eedc2cb0..c6c0331354 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,16 +2,24 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use LibreNMS\Authentication\LegacyAuth;
 
 class User extends Authenticatable
 {
     use Notifiable;
 
     protected $primaryKey = 'user_id';
-    protected $fillable = ['realname', 'username', 'email', 'level', 'descr', 'can_modify_passwd'];
+    protected $fillable = ['realname', 'username', 'email', 'level', 'descr', 'can_modify_passwd', 'auth_type', 'auth_id'];
     protected $hidden = ['password', 'remember_token', 'pivot'];
+    protected $attributes = [ // default values
+        'descr' => '',
+        'realname' => '',
+        'email' => '',
+        'can_modify_passwd' => 0,
+    ];
 
     // ---- Helper Functions ----
 
@@ -27,13 +35,34 @@ class User extends Authenticatable
     }
 
     /**
-     * Test if the User is an admin or demo.
+     * Test if this user has global admin access
+     * these users have a level of 10 or 11 (demo).
+     *
+     * @return boolean
+     */
+    public function hasGlobalAdmin()
+    {
+        return $this->level >= 10;
+    }
+
+    /**
+     * Test if the User is an admin.
      *
      * @return boolean
      */
     public function isAdmin()
     {
-        return $this->level >= 10;
+        return $this->level == 10;
+    }
+
+    /**
+     * Test if this user is the demo user
+     *
+     * @return bool
+     */
+    public function isDemo()
+    {
+        return $this->level == 11;
     }
 
     /**
@@ -47,6 +76,27 @@ class User extends Authenticatable
         return $this->hasGlobalRead() || $this->devices->contains($device);
     }
 
+    // ---- Query scopes ----
+
+    /**
+     * This restricts the query to only users that match the current auth method
+     * It is not needed when using user_id, but should be used for username and auth_id
+     *
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeThisAuth($query)
+    {
+        // find user including ones where we might not know the auth type
+        $type = LegacyAuth::getType();
+
+        return $query->where(function ($query) use ($type) {
+            $query->where('auth_type', $type)
+                ->orWhereNull('auth_type')
+                ->orWhere('auth_type', '');
+        });
+    }
+
     // ---- Define Relationships ----
 
     public function devices()
@@ -75,8 +125,13 @@ class User extends Authenticatable
         return $this->hasMany('App\Models\Dashboard', 'user_id');
     }
 
+    public function preferences()
+    {
+        return $this->hasMany('App\Models\UserPref', 'user_id');
+    }
+
     public function widgets()
     {
-        return $this->hasMany('App\Models\UsersWidgets', 'user_id');
+        return $this->hasMany('App\Models\UserWidget', 'user_id');
     }
 }
diff --git a/app/Models/UserPref.php b/app/Models/UserPref.php
new file mode 100644
index 0000000000..002db61592
--- /dev/null
+++ b/app/Models/UserPref.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * UserPref.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class UserPref extends BaseModel
+{
+    public $timestamps = false;
+    public $incrementing = false;
+    protected $table = 'users_prefs';
+    protected $primaryKey = ['user_id', 'pref'];
+    protected $fillable = ['user_id', 'pref', 'value'];
+
+    // ---- Helper Functions ----
+    public static function getPref(User $user, $pref)
+    {
+        return $user->preferences()->where('pref', $pref)->value('value');
+    }
+
+    public static function setPref(User $user, $pref, $value)
+    {
+        return UserPref::updateOrCreate(['user_id' => $user->user_id, 'pref' => $pref], ['value' => $value]);
+    }
+
+    public static function forgetPref(User $user, $pref)
+    {
+        return $user->preferences()->where('pref', $pref)->delete();
+    }
+
+    // ---- Accessors/Mutators ----
+
+    public function getValueAttribute($value)
+    {
+        $decoded = json_decode($value, true);
+        if (json_last_error() == JSON_ERROR_NONE) {
+            return $decoded;
+        }
+
+        return $value;
+    }
+
+    public function setValueAttribute($value)
+    {
+        if (is_array($value)) {
+            $this->attributes['value'] = json_encode($value);
+        } else {
+            $this->attributes['value'] = $value;
+        }
+    }
+
+    // ---- Query Scopes ----
+
+    public function scopePref($query, $pref)
+    {
+        return $query->where('pref', $pref);
+    }
+
+    // ---- Define Relationships ----
+
+    public function user()
+    {
+        return $this->belongsTo('App\Models\User', 'user_id');
+    }
+
+
+    /**
+     * Set the keys for a save update query. (no primary key)
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function setKeysForSaveQuery(Builder $query)
+    {
+        $keys = $this->getKeyName();
+        if (!is_array($keys)) {
+            return parent::setKeysForSaveQuery($query);
+        }
+
+        foreach ($keys as $keyName) {
+            $query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get the primary key value for a save query. (no primary key)
+     *
+     * @param mixed $keyName
+     * @return mixed
+     */
+    protected function getKeyForSaveQuery($keyName = null)
+    {
+        if (is_null($keyName)) {
+            $keyName = $this->getKeyName();
+        }
+
+        if (isset($this->original[$keyName])) {
+            return $this->original[$keyName];
+        }
+
+        return $this->getAttribute($keyName);
+    }
+}
diff --git a/app/Models/UserWidget.php b/app/Models/UserWidget.php
new file mode 100644
index 0000000000..3e2fd2f3ed
--- /dev/null
+++ b/app/Models/UserWidget.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models;
+
+use Auth;
+use Illuminate\Database\Eloquent\Model;
+
+class UserWidget extends Model
+{
+    public $timestamps = false;
+    protected $table = 'users_widgets';
+    protected $primaryKey = 'user_widget_id';
+    protected $fillable = ['user_id', 'widget_id', 'col', 'row', 'size_x', 'size_y', 'title', 'refresh', 'settings', 'dashboard_id'];
+    protected $casts = ['settings' => 'array'];
+
+    // ---- Define Relationships ----
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo('App\Models\User', 'user_id');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function widget()
+    {
+        return $this->hasOne('App\Models\Widgets', 'widget_id');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function dashboard()
+    {
+        return $this->belongsTo('App\Models\Dashboard', 'dashboard_id');
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 570c4f24e1..e4db0b8e69 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
 use LibreNMS\Config;
 use LibreNMS\Exceptions\DatabaseConnectException;
+use Request;
 
 include_once __DIR__ . '/../../includes/dbFacile.php';
 
@@ -55,7 +56,10 @@ class AppServiceProvider extends ServiceProvider
             }
 
             if (config('app.debug') && class_exists(\Barryvdh\Debugbar\ServiceProvider::class)) {
-                $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
+                // disable debugbar for api routes
+                if (!Request::is('api/*')) {
+                    $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
+                }
             }
         }
     }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 1e877c00b8..4b68ea66a5 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,7 +2,8 @@
 
 namespace App\Providers;
 
-use App\Extensions\LegacyUserProvider;
+use App\Providers\LegacyUserProvider;
+use App\Guards\ApiTokenGuard;
 use Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -30,5 +31,28 @@ class AuthServiceProvider extends ServiceProvider
         Auth::provider('legacy', function ($app, array $config) {
             return new LegacyUserProvider();
         });
+
+        Auth::provider('token_provider', function ($app, array $config) {
+            return new TokenUserProvider();
+        });
+
+        Auth::extend('token_driver', function ($app, $name, array $config) {
+            $userProvider = $app->make(TokenUserProvider::class);
+            $request = $app->make('request');
+            return new ApiTokenGuard($userProvider, $request);
+        });
+
+        Gate::define('global-admin', function ($user) {
+            return $user->hasGlobalAdmin();
+        });
+        Gate::define('admin', function ($user) {
+            return $user->isAdmin();
+        });
+        Gate::define('global-read', function ($user) {
+            return $user->hasGlobalRead();
+        });
+        Gate::define('device', function ($user, $device) {
+            return $user->canAccessDevice($device);
+        });
     }
 }
diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
index 0ebb225c3e..d7bea5fc40 100644
--- a/app/Providers/ComposerServiceProvider.php
+++ b/app/Providers/ComposerServiceProvider.php
@@ -37,6 +37,7 @@ class ComposerServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        View::composer('layouts.librenmsv1', 'App\Http\ViewComposers\LayoutComposer');
         View::composer('layouts.menu', 'App\Http\ViewComposers\MenuComposer');
     }
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index fca6152c3a..883b7ba88c 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider
@@ -13,9 +12,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
-        ],
+        'Illuminate\Auth\Events\Login' => ['App\Listeners\AuthEventListener@login'],
+        'Illuminate\Auth\Events\Logout' => ['App\Listeners\AuthEventListener@logout'],
     ];
 
     /**
diff --git a/app/Providers/LegacyUserProvider.php b/app/Providers/LegacyUserProvider.php
new file mode 100644
index 0000000000..239325e9ef
--- /dev/null
+++ b/app/Providers/LegacyUserProvider.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * LegacyUserProvider.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Providers;
+
+use App\Models\ApiToken;
+use App\Models\User;
+use DB;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Contracts\Auth\UserProvider;
+use LibreNMS\Authentication\LegacyAuth;
+use LibreNMS\Exceptions\AuthenticationException;
+use Request;
+use Session;
+
+class LegacyUserProvider implements UserProvider
+{
+    /**
+     * Retrieve a user by their unique identifier.
+     *
+     * @param  mixed $identifier
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    public function retrieveById($identifier)
+    {
+        $username = User::where('user_id', $identifier)->value('username');
+
+        return $this->fetchUserByName($username);
+    }
+
+    /**
+     * Retrieve a user by their unique identifier and "remember me" token.
+     *
+     * @param  mixed $identifier
+     * @param  string $token
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    public function retrieveByToken($identifier, $token)
+    {
+        $user = new User();
+        $user = $user->where($user->getAuthIdentifierName(), $identifier)->first();
+
+        if (!$user) {
+            return null;
+        }
+
+        $rememberToken = $user->getRememberToken();
+        if ($rememberToken && hash_equals($rememberToken, $token)) {
+            if (LegacyAuth::get()->userExists($user->username)) {
+                return $user;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Update the "remember me" token for the given user in storage.
+     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param  string $token
+     * @return void
+     */
+    public function updateRememberToken(Authenticatable $user, $token)
+    {
+        $user->setRememberToken($token);
+        $timestamps = $user->timestamps;
+        $user->timestamps = false;
+        $user->save();
+        $user->timestamps = $timestamps;
+    }
+
+    /**
+     * Retrieve a user by the given credentials.
+     *
+     * @param  array $credentials
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     */
+    public function retrieveByCredentials(array $credentials)
+    {
+        return $this->fetchUserByName($credentials['username'], $credentials['password']);
+    }
+
+    /**
+     * Validate a user against the given credentials.
+     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable $user
+     * @param  array $credentials
+     * @return bool
+     */
+    public function validateCredentials(Authenticatable $user, array $credentials)
+    {
+        error_reporting(0);
+
+        $authorizer = LegacyAuth::get();
+
+        try {
+            // try authentication methods
+            // collect username and password
+            $password = null;
+            if (isset($credentials['username']) && isset($credentials['password'])) {
+                $username = $credentials['username'];
+                $password = $credentials['password'];
+            } elseif ($authorizer->authIsExternal()) {
+                $username = $authorizer->getExternalUsername();
+            }
+
+            if (!isset($username) || !$authorizer->authenticate($username, $password)) {
+                throw new AuthenticationException('Invalid Credentials');
+            }
+
+            return true;
+        } catch (AuthenticationException $ae) {
+            global $debug;
+
+            $auth_message = $ae->getMessage();
+            if ($debug) {
+                $auth_message .= '<br /> ' . $ae->getFile() . ': ' . $ae->getLine();
+            }
+            \Toastr::error($auth_message);
+
+            if (empty($username)) {
+                $username = Session::get('username', $credentials['username']);
+            }
+            DB::table('authlog')->insert(['user' => $username, 'address' => Request::ip(), 'result' => $auth_message]);
+        } finally {
+            error_reporting(-1);
+        }
+
+        return false;
+    }
+
+    /**
+     * Fetch user by username from legacy auth, update it or add it to the db then return it.
+     *
+     * @param string $username
+     * @return User|null
+     */
+    protected function fetchUserByName($username, $password = null)
+    {
+        error_reporting(0);
+
+        $auth = LegacyAuth::get();
+        $type = LegacyAuth::getType();
+
+        $auth_id = $auth->getUserid($username);
+        $new_user = $auth->getUser($auth_id);
+
+        error_reporting(-1);
+
+        if (empty($new_user)) {
+            // some legacy auth create users in the authenticate method, if it doesn't exist yet, lets try authenticate (Laravel calls retrieveByCredentials first)
+            try {
+                error_reporting(0);
+
+                $auth->authenticate($username, $password);
+                $auth_id = $auth->getUserid($username);
+                $new_user = $auth->getUser($auth_id);
+
+                error_reporting(-1);
+            } catch (AuthenticationException $ae) {
+                //
+            }
+
+            if (empty($new_user)) {
+                return null;
+            }
+        }
+
+        unset($new_user['user_id']);
+
+        // remove null fields
+        $new_user = array_filter($new_user, function ($var) {
+            return !is_null($var);
+        });
+
+        // always create an entry in the users table, but separate by type
+        $user = User::thisAuth()->firstOrNew(['username' => $username], $new_user);
+        /** @var User $user */
+
+        // doing this here in case it was null (legacy)
+        $user->auth_type = $type;
+        $user->auth_id = $auth_id;
+        $user->save();
+
+        return $user;
+    }
+}
diff --git a/app/Extensions/LegacyUserProvider.php b/app/Providers/TokenUserProvider.php
similarity index 66%
rename from app/Extensions/LegacyUserProvider.php
rename to app/Providers/TokenUserProvider.php
index 188af5856d..141f60f46f 100644
--- a/app/Extensions/LegacyUserProvider.php
+++ b/app/Providers/TokenUserProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * LegacyAuth.php
+ * TokenUserProvider.php
  *
  * -Description-
  *
@@ -23,36 +23,14 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-namespace App\Extensions;
+namespace App\Providers;
 
-use App\Models\User;
+use App\Models\ApiToken;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
-use LibreNMS\Authentication\Auth as LegacyAuth;
-use LibreNMS\Exceptions\AuthenticationException;
 
-class LegacyUserProvider implements UserProvider
+class TokenUserProvider extends LegacyUserProvider implements UserProvider
 {
-
-    /**
-     * Retrieve a user by their unique identifier.
-     *
-     * @param  mixed $identifier
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
-     */
-    public function retrieveById($identifier)
-    {
-        $user_array = LegacyAuth::get()->getUser($identifier);
-        if (empty($user_array)) {
-            return null;
-        }
-
-        $user = new User($user_array);
-        $user->user_id = $user_array['user_id'];
-
-        return $user;
-    }
-
     /**
      * Retrieve a user by their unique identifier and "remember me" token.
      *
@@ -62,7 +40,7 @@ class LegacyUserProvider implements UserProvider
      */
     public function retrieveByToken($identifier, $token)
     {
-        // TODO: Implement retrieveByToken() method.
+        return null;
     }
 
     /**
@@ -74,7 +52,7 @@ class LegacyUserProvider implements UserProvider
      */
     public function updateRememberToken(Authenticatable $user, $token)
     {
-        // TODO: Implement updateRememberToken() method.
+        return;
     }
 
     /**
@@ -85,8 +63,17 @@ class LegacyUserProvider implements UserProvider
      */
     public function retrieveByCredentials(array $credentials)
     {
-        $username = $credentials['username'];
-        $user_id = LegacyAuth::get()->getUserid($username);
+        if (!ApiToken::isValid($credentials['api_token'])) {
+            return null;
+        }
+
+        $user = ApiToken::userFromToken($credentials['api_token']);
+        if (!is_null($user)) {
+            return $user;
+        }
+
+        // missing user for existing token, create it
+        $user_id = ApiToken::idFromToken($credentials['api_token']);
 
         return $this->retrieveById($user_id);
     }
@@ -100,12 +87,6 @@ class LegacyUserProvider implements UserProvider
      */
     public function validateCredentials(Authenticatable $user, array $credentials)
     {
-        try {
-            return LegacyAuth::get()->authenticate($credentials['username'], $credentials['password']);
-        } catch (AuthenticationException $e) {
-            \Toastr::error($e->getMessage());
-        }
-
-        return null;
+        return ApiToken::isValid($credentials['api_token'], $user->user_id);
     }
 }
diff --git a/config/auth.php b/config/auth.php
index cc5256811a..aefe6ee379 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -41,9 +41,9 @@ return [
             'provider' => 'legacy',
         ],
 
-        'api' => [
-            'driver' => 'token',
-            'provider' => 'legacy',
+        'token' => [
+            'driver' => 'token_driver',
+            'provider' => 'token_provider',
         ],
     ],
 
@@ -71,7 +71,8 @@ return [
         ],
 
          'legacy' => [
-             'driver' => 'legacy'
+             'driver' => 'legacy',
+             'model' => App\Models\User::class,
          ],
     ],
 
diff --git a/config/debugbar.php b/config/debugbar.php
index 0fb450fd83..bfcb819df7 100644
--- a/config/debugbar.php
+++ b/config/debugbar.php
@@ -13,6 +13,9 @@ return [
      */
 
     'enabled' => env('DEBUGBAR_ENABLED', null),
+    'except' => [
+        'api*' // won't work until DebugBar 3.*
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -74,7 +77,7 @@ return [
      |
      */
     'error_handler' => false,
-    
+
     /*
      |--------------------------------------------------------------------------
      | Clockwork integration
diff --git a/doc/Developing/Code-Structure.md b/doc/Developing/Code-Structure.md
index c3dfd6f6ac..d740bef37a 100644
--- a/doc/Developing/Code-Structure.md
+++ b/doc/Developing/Code-Structure.md
@@ -20,7 +20,7 @@ All used css files are located here. Apart from legacy files, anything in here i
 ### html/css/custom
 This is a folder you can put custom css files into that won't interfere with auto updates
 ### html/forms
-This folder contains all of the files that are dynamically included from an ajax call to html/ajax_form.php.
+This folder contains all of the files that are dynamically included from an ajax call to ajax/form.
 ### html/includes
 This is where the majority of the website core files are located. These tend to be files that contain functions or often used code segments that can be included where needed rather than duplicating code.
 ### html/includes/api_functions.inc.php
diff --git a/html/ajax_dash.php b/html/ajax_dash.php
index 1c07620414..6d06202676 100644
--- a/html/ajax_dash.php
+++ b/html/ajax_dash.php
@@ -12,14 +12,14 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo 'unauthenticated';
     exit;
 }
diff --git a/html/ajax_form.php b/html/ajax_form.php
index 50a0cec201..961121efa5 100644
--- a/html/ajax_form.php
+++ b/html/ajax_form.php
@@ -14,14 +14,14 @@
 
 // FUA
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth', 'alerts', 'laravel');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug(isset($_REQUEST['debug']) ? $_REQUEST['debug'] : false);
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo 'unauthenticated';
     exit;
 }
diff --git a/html/ajax_list.php b/html/ajax_list.php
index 18892047df..08f77d5edc 100644
--- a/html/ajax_list.php
+++ b/html/ajax_list.php
@@ -13,12 +13,12 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo "Unauthenticated\n";
     exit;
 }
diff --git a/html/ajax_listports.php b/html/ajax_listports.php
index 00db34c839..b9b022b777 100644
--- a/html/ajax_listports.php
+++ b/html/ajax_listports.php
@@ -10,14 +10,14 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo 'unauthenticated';
     exit;
 }
diff --git a/html/ajax_ossuggest.php b/html/ajax_ossuggest.php
index f3609a706f..f3418f59f0 100644
--- a/html/ajax_ossuggest.php
+++ b/html/ajax_ossuggest.php
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     die('Unauthorized.');
 }
 
diff --git a/html/ajax_output.php b/html/ajax_output.php
index aa2a2d41f7..a032625393 100644
--- a/html/ajax_output.php
+++ b/html/ajax_output.php
@@ -12,7 +12,7 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 session_start();
 if (isset($_SESSION['stage']) && $_SESSION['stage'] == 2) {
@@ -22,7 +22,7 @@ if (isset($_SESSION['stage']) && $_SESSION['stage'] == 2) {
     $init_modules = array('web', 'auth', 'alerts');
     require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-    if (!Auth::check()) {
+    if (!LegacyAuth::check()) {
         echo "Unauthenticated\n";
         exit;
     }
diff --git a/html/ajax_rulesuggest.php b/html/ajax_rulesuggest.php
index 3afe8006c8..2fbc43f418 100644
--- a/html/ajax_rulesuggest.php
+++ b/html/ajax_rulesuggest.php
@@ -23,12 +23,12 @@
  * @package LibreNMS/Alerts
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     die('Unauthorized.');
 }
 
diff --git a/html/ajax_search.php b/html/ajax_search.php
index 99526fc7de..5347137b1a 100644
--- a/html/ajax_search.php
+++ b/html/ajax_search.php
@@ -1,13 +1,13 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo "Unauthenticated\n";
     exit;
 }
@@ -45,10 +45,10 @@ if (isset($_REQUEST['search'])) {
             die(json_encode($results));
         } elseif ($_REQUEST['type'] == 'device') {
             // Device search
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT * FROM `devices` WHERE `hostname` LIKE '%".$search."%' OR `location` LIKE '%".$search."%' OR `sysName` LIKE '%".$search."%' OR `purpose` LIKE '%".$search."%' OR `notes` LIKE '%".$search."%' ORDER BY hostname LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT * FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND (`hostname` LIKE '%".$search."%' OR `location` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(Auth::id()));
+                $results = dbFetchRows("SELECT * FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND (`hostname` LIKE '%".$search."%' OR `location` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(LegacyAuth::id()));
             }
 
             if (count($results)) {
@@ -70,10 +70,10 @@ if (isset($_REQUEST['search'])) {
                         $highlight_colour = '#008000';
                     }
 
-                    if (Auth::user()->hasGlobalRead()) {
+                    if (LegacyAuth::user()->hasGlobalRead()) {
                         $num_ports = dbFetchCell('SELECT COUNT(*) FROM `ports` WHERE device_id = ?', array($result['device_id']));
                     } else {
-                        $num_ports = dbFetchCell('SELECT COUNT(*) FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND `I`.`device_id` = `D`.`device_id` AND device_id = ?', array(Auth::id(), $result['device_id']));
+                        $num_ports = dbFetchCell('SELECT COUNT(*) FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND `I`.`device_id` = `D`.`device_id` AND device_id = ?', array(LegacyAuth::id(), $result['device_id']));
                     }
 
                     $device[] = array(
@@ -95,10 +95,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'ports') {
             // Search ports
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT `ports`.*,`devices`.* FROM `ports` LEFT JOIN `devices` ON  `ports`.`device_id` =  `devices`.`device_id` WHERE `ifAlias` LIKE '%".$search."%' OR `ifDescr` LIKE '%".$search."%' OR `ifName` LIKE '%".$search."%' ORDER BY ifDescr LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT DISTINCT(`I`.`port_id`), `I`.*, `D`.`hostname` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` AND (`ifAlias` LIKE '%".$search."%' OR `ifDescr` LIKE '%".$search."%' OR `ifName` LIKE '%".$search."%') ORDER BY ifDescr LIMIT ".$limit, array(Auth::id(), Auth::id()));
+                $results = dbFetchRows("SELECT DISTINCT(`I`.`port_id`), `I`.*, `D`.`hostname` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` AND (`ifAlias` LIKE '%".$search."%' OR `ifDescr` LIKE '%".$search."%' OR `ifName` LIKE '%".$search."%') ORDER BY ifDescr LIMIT ".$limit, array(LegacyAuth::id(), LegacyAuth::id()));
             }
 
             if (count($results)) {
@@ -141,10 +141,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'bgp') {
             // Search bgp peers
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT `bgpPeers`.*,`devices`.* FROM `bgpPeers` LEFT JOIN `devices` ON  `bgpPeers`.`device_id` =  `devices`.`device_id` WHERE `astext` LIKE '%".$search."%' OR `bgpPeerIdentifier` LIKE '%".$search."%' OR `bgpPeerRemoteAs` LIKE '%".$search."%' ORDER BY `astext` LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT `bgpPeers`.*,`D`.* FROM `bgpPeers`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND  `bgpPeers`.`device_id`=`D`.`device_id` AND  (`astext` LIKE '%".$search."%' OR `bgpPeerIdentifier` LIKE '%".$search."%' OR `bgpPeerRemoteAs` LIKE '%".$search."%') ORDER BY `astext` LIMIT ".$limit, array(Auth::id()));
+                $results = dbFetchRows("SELECT `bgpPeers`.*,`D`.* FROM `bgpPeers`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND  `bgpPeers`.`device_id`=`D`.`device_id` AND  (`astext` LIKE '%".$search."%' OR `bgpPeerIdentifier` LIKE '%".$search."%' OR `bgpPeerRemoteAs` LIKE '%".$search."%') ORDER BY `astext` LIMIT ".$limit, array(LegacyAuth::id()));
             }
 
             if (count($results)) {
@@ -191,10 +191,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'applications') {
             // Device search
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT * FROM `applications` INNER JOIN `devices` ON devices.device_id = applications.device_id WHERE `app_type` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%' ORDER BY hostname LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT * FROM `applications` INNER JOIN `devices` AS `D` ON `D`.`device_id` = `applications`.`device_id` INNER JOIN `devices_perms` AS `P` ON `P`.`device_id` = `D`.`device_id` WHERE `P`.`user_id` = ? AND (`app_type` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(Auth::id()));
+                $results = dbFetchRows("SELECT * FROM `applications` INNER JOIN `devices` AS `D` ON `D`.`device_id` = `applications`.`device_id` INNER JOIN `devices_perms` AS `P` ON `P`.`device_id` = `D`.`device_id` WHERE `P`.`user_id` = ? AND (`app_type` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(LegacyAuth::id()));
             }
 
             if (count($results)) {
@@ -232,10 +232,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'munin') {
             // Device search
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT * FROM `munin_plugins` INNER JOIN `devices` ON devices.device_id = munin_plugins.device_id WHERE `mplug_type` LIKE '%".$search."%' OR `mplug_title` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%' ORDER BY hostname LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT * FROM `munin_plugins` INNER JOIN `devices` AS `D` ON `D`.`device_id` = `munin_plugins`.`device_id` INNER JOIN `devices_perms` AS `P` ON `P`.`device_id` = `D`.`device_id` WHERE `P`.`user_id` = ? AND (`mplug_type` LIKE '%".$search."%' OR `mplug_title` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(Auth::id()));
+                $results = dbFetchRows("SELECT * FROM `munin_plugins` INNER JOIN `devices` AS `D` ON `D`.`device_id` = `munin_plugins`.`device_id` INNER JOIN `devices_perms` AS `P` ON `P`.`device_id` = `D`.`device_id` WHERE `P`.`user_id` = ? AND (`mplug_type` LIKE '%".$search."%' OR `mplug_title` LIKE '%".$search."%' OR `hostname` LIKE '%".$search."%') ORDER BY hostname LIMIT ".$limit, array(LegacyAuth::id()));
             }
 
             if (count($results)) {
@@ -273,10 +273,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'iftype') {
             // Device search
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT `ports`.ifType FROM `ports` WHERE `ifType` LIKE '%".$search."%' GROUP BY ifType ORDER BY ifType LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT `I`.ifType FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` AND (`ifType` LIKE '%".$search."%') GROUP BY ifType ORDER BY ifType LIMIT ".$limit, array(Auth::id(), Auth::id()));
+                $results = dbFetchRows("SELECT `I`.ifType FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` AND (`ifType` LIKE '%".$search."%') GROUP BY ifType ORDER BY ifType LIMIT ".$limit, array(LegacyAuth::id(), LegacyAuth::id()));
             }
             if (count($results)) {
                 $found   = 1;
@@ -293,10 +293,10 @@ if (isset($_REQUEST['search'])) {
             die($json);
         } elseif ($_REQUEST['type'] == 'bill') {
             // Device search
-            if (Auth::user()->hasGlobalRead()) {
+            if (LegacyAuth::user()->hasGlobalRead()) {
                 $results = dbFetchRows("SELECT `bills`.bill_id, `bills`.bill_name FROM `bills` WHERE `bill_name` LIKE '%".$search."%' OR `bill_notes` LIKE '%".$search."%' LIMIT ".$limit);
             } else {
-                $results = dbFetchRows("SELECT `bills`.bill_id, `bills`.bill_name FROM `bills` INNER JOIN `bill_perms` ON `bills`.bill_id = `bill_perms`.bill_id WHERE `bill_perms`.user_id = ? AND (`bill_name` LIKE '%".$search."%' OR `bill_notes` LIKE '%".$search."%') LIMIT ".$limit, array(Auth::id()));
+                $results = dbFetchRows("SELECT `bills`.bill_id, `bills`.bill_name FROM `bills` INNER JOIN `bill_perms` ON `bills`.bill_id = `bill_perms`.bill_id WHERE `bill_perms`.user_id = ? AND (`bill_name` LIKE '%".$search."%' OR `bill_notes` LIKE '%".$search."%') LIMIT ".$limit, array(LegacyAuth::id()));
             }
             $json = json_encode($results);
             die($json);
diff --git a/html/ajax_table.php b/html/ajax_table.php
index 430e63e1ed..7c0631560b 100644
--- a/html/ajax_table.php
+++ b/html/ajax_table.php
@@ -12,12 +12,12 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo "Unauthenticated\n";
     exit;
 }
diff --git a/html/css/styles.css b/html/css/styles.css
index 1349b5fd79..628aa41c91 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -2147,7 +2147,8 @@ label {
 }
 
 .device-table-icon img {
-    width: 32px;
+  width: 32px;
+  max-height: 32px;
 }
 
 .device-icon img {
@@ -2171,6 +2172,7 @@ label {
   display: inline-block;
   width: 7px;
   min-height: 27px;
+  height: 32px;
 }
 
 .device-services-page {
@@ -2199,3 +2201,7 @@ label {
 .select2-selection--multiple .select2-search--inline .select2-search__field {
   width: auto !important;
 }
+
+.toast-top-right {
+  top: 34px;
+}
diff --git a/html/includes/api_functions.inc.php b/html/includes/api_functions.inc.php
index 21b730422e..fd5811a200 100644
--- a/html/includes/api_functions.inc.php
+++ b/html/includes/api_functions.inc.php
@@ -12,25 +12,22 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 function authToken(\Slim\Route $route)
 {
     global $permissions;
 
-    $app   = \Slim\Slim::getInstance();
-    $token = $app->request->headers->get('X-Auth-Token');
-    if (!empty($token)
-        && ($user_id = dbFetchCell('SELECT `AT`.`user_id` FROM `api_tokens` AS AT WHERE `AT`.`token_hash`=? && `AT`.`disabled`=0', array($token)))
-        && ($user = Auth::get()->getUser($user_id))
-    ) {
+    if (Auth::check()) {
+        $user = Auth::user();
+
         // Fake session so the standard auth/permissions checks work
-        $_SESSION = array(
-            'username' => $user['username'],
-            'user_id' => $user['user_id'],
-            'userlevel' => $user['level']
-        );
-        $permissions = permissions_cache(Auth::id());
+        $_SESSION = [
+            'username' => $user->username,
+            'user_id' => $user->user_id,
+            'userlevel' => $user->level
+        ];
+        $permissions = permissions_cache($user->user_id);
 
         return;
     }
@@ -109,14 +106,14 @@ function check_port_permission($port_id, $device_id)
 
 function check_is_admin()
 {
-    if (!Auth::user()->hasGlobalAdmin()) {
+    if (!LegacyAuth::user()->hasGlobalAdmin()) {
         api_error(403, 'Insufficient privileges');
     }
 }
 
 function check_is_read()
 {
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         api_error(403, 'Insufficient privileges');
     }
 }
@@ -353,9 +350,9 @@ function list_devices()
     }
 
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql .= " AND `d`.`device_id` IN (SELECT device_id FROM devices_perms WHERE user_id = ?)";
-        $param[] = Auth::id();
+        $param[] = LegacyAuth::id();
     }
     $devices = array();
     $dev_query = "SELECT $select FROM `devices` AS d $join WHERE $sql GROUP BY d.`hostname` ORDER BY $order";
@@ -583,9 +580,9 @@ function list_cbgp()
         $sql        = " AND `devices`.`device_id` = ?";
         $sql_params[] = $device_id;
     }
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql .= " AND `bgpPeers_cbgp`.`device_id` IN (SELECT device_id FROM devices_perms WHERE user_id = ?)";
-        $sql_params[] = Auth::id();
+        $sql_params[] = LegacyAuth::id();
     }
 
     $bgp_counters = array();
@@ -910,7 +907,7 @@ function get_port_graphs()
     $params = array($device_id);
     if (!device_permitted($device_id)) {
         $sql = 'AND `port_id` IN (select `port_id` from `ports_perms` where `user_id` = ?)';
-        array_push($params, Auth::id());
+        array_push($params, LegacyAuth::id());
     }
 
     $ports       = dbFetchRows("SELECT $columns FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' $sql ORDER BY `ifIndex` ASC", $params);
@@ -980,10 +977,10 @@ function get_all_ports()
     validate_column_list($columns, 'ports');
     $params = array();
     $sql = '';
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql = ' AND (device_id IN (SELECT device_id FROM devices_perms WHERE user_id = ?) OR port_id IN (SELECT port_id FROM ports_perms WHERE user_id = ?))';
-        array_push($params, Auth::id());
-        array_push($params, Auth::id());
+        array_push($params, LegacyAuth::id());
+        array_push($params, LegacyAuth::id());
     }
     $ports = dbFetchRows("SELECT $columns FROM `ports` WHERE `deleted` = 0 $sql", $params);
 
@@ -1322,9 +1319,9 @@ function list_bills()
     } else {
         $sql = '1';
     }
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql    .= ' AND `bill_id` IN (SELECT `bill_id` FROM `bill_perms` WHERE `user_id` = ?)';
-        $param[] = Auth::id();
+        $param[] = LegacyAuth::id();
     }
 
     if ($period === 'previous') {
@@ -1380,7 +1377,7 @@ function get_bill_graph()
     $bill_id = mres($router['bill_id']);
     $graph_type = $router['graph_type'];
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         check_bill_permission($bill_id);
     }
 
@@ -1406,7 +1403,7 @@ function get_bill_graphdata()
     $bill_id = mres($router['bill_id']);
     $graph_type = $router['graph_type'];
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         check_bill_permission($bill_id);
     }
 
@@ -1434,7 +1431,7 @@ function get_bill_history()
     $router = $app->router()->getCurrentRoute()->getParams();
     $bill_id = mres($router['bill_id']);
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         check_bill_permission($bill_id);
     }
 
@@ -1456,7 +1453,7 @@ function get_bill_history_graph()
     $bill_hist_id = mres($router['bill_hist_id']);
     $graph_type = $router['graph_type'];
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         check_bill_permission($bill_id);
     }
 
@@ -1500,7 +1497,7 @@ function get_bill_history_graphdata()
     $bill_hist_id = mres($router['bill_hist_id']);
     $graph_type = $router['graph_type'];
 
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         check_bill_permission($bill_id);
     }
 
@@ -1829,9 +1826,9 @@ function list_vrf()
         $sql        = "  AND `vrfs`.`vrf_name`=?";
         $sql_params = array($vrfname);
     }
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql .= " AND `vrfs`.`device_id` IN (SELECT device_id FROM devices_perms WHERE user_id = ?)";
-        $sql_params[] = Auth::id();
+        $sql_params[] = LegacyAuth::id();
     }
 
     $vrfs       = array();
@@ -1902,9 +1899,9 @@ function list_vlans()
         $sql        = " AND `devices`.`device_id` = ?";
         $sql_params[] = $device_id;
     }
-    if (!Auth::user()->hasGlobalRead()) {
+    if (!LegacyAuth::user()->hasGlobalRead()) {
         $sql .= " AND `vlans`.`device_id` IN (SELECT device_id FROM devices_perms WHERE user_id = ?)";
-        $sql_params[] = Auth::id();
+        $sql_params[] = LegacyAuth::id();
     }
 
     $vlans       = array();
diff --git a/html/includes/authenticate.inc.php b/html/includes/authenticate.inc.php
deleted file mode 100644
index e7d95ba638..0000000000
--- a/html/includes/authenticate.inc.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-use LibreNMS\Authentication\Auth;
-use LibreNMS\Authentication\TwoFactor;
-use LibreNMS\Config;
-use LibreNMS\Exceptions\AuthenticationException;
-
-ini_set('session.use_only_cookies', 1);
-ini_set('session.cookie_httponly', 1);
-ini_set('session.use_strict_mode', 1); // php >= 5.5.2
-ini_set('session.use_trans_sid', 0);   // insecure feature, be sure it is disabled
-
-// Clear up any old sessions
-dbDelete('session', '`session_expiry` <  ?', array(time()));
-
-session_start();
-
-$authorizer =  Auth::get();
-if ($vars['page'] == 'logout' && $authorizer->sessionAuthenticated()) {
-    $authorizer->logOutUser();
-    header('Location: ' . Config::get('post_logout_action', Config::get('base_url')));
-    exit;
-}
-
-try {
-    if ($authorizer->sessionAuthenticated()) {
-        // session authenticated already
-        $authorizer->logInUser();
-    } else {
-        // try authentication methods
-
-        if (isset($_POST['twofactor']) && TwoFactor::authenticate($_POST['twofactor'])) {
-            // process two-factor auth tokens
-            $authorizer->logInUser();
-        } elseif (isset($_COOKIE['sess_id'], $_COOKIE['token']) &&
-            $authorizer->reauthenticate(clean($_COOKIE['sess_id']), clean($_COOKIE['token']))
-        ) {
-            $_SESSION['remember'] = true;
-            $_SESSION['twofactor'] = true; // trust cookie
-            // cookie authentication
-            $authorizer->logInUser();
-        } else {
-            // collect username and password
-            $password = null;
-            if (isset($_REQUEST['username']) && isset($_REQUEST['password'])) {
-                $username = clean($_REQUEST['username']);
-                $password = $_REQUEST['password'];
-            } elseif ($authorizer->authIsExternal()) {
-                $username = $authorizer->getExternalUsername();
-            }
-
-            // form authentication
-            if (isset($username) && $authorizer->authenticate($username, $password)) {
-                $_SESSION['username'] = $username;
-
-                if (isset($_POST['remember'])) {
-                    $_SESSION['remember'] = $_POST['remember'];
-                }
-
-                if ($authorizer->logInUser()) {
-                    // redirect to original uri or home page.
-                    header('Location: '.rtrim($config['base_url'], '/').$_SERVER['REQUEST_URI'], true, 303);
-                }
-            }
-        }
-    }
-} catch (AuthenticationException $ae) {
-    $auth_message = $ae->getMessage();
-    if ($debug) {
-        $auth_message .= '<br /> ' . $ae->getFile() . ': ' . $ae->getLine();
-    }
-
-    dbInsert(
-        array('user' => $_SESSION['username'], 'address' => get_client_ip(), 'result' => $auth_message),
-        'authlog'
-    );
-    $authorizer->logOutUser($auth_message);
-}
-
-session_write_close();
-
-// populate the permissions cache
-if (isset($_SESSION['user_id'])) {
-    $permissions = permissions_cache($_SESSION['user_id']);
-}
-
-unset($username, $password);
diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php
index 70bb7375db..c57083f866 100644
--- a/html/includes/common/availability-map.inc.php
+++ b/html/includes/common/availability-map.inc.php
@@ -12,7 +12,7 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (isset($widget_settings['mode_select']) && $widget_settings['mode_select'] !== '') {
     $mode = $widget_settings['mode_select'];
@@ -173,9 +173,9 @@ if (defined('SHOW_SETTINGS')) {
 
         $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon`, `D`.`ignore`, `D`.`disabled` FROM `devices` AS `D`';
 
-        if (!Auth::user()->hasGlobalRead()) {
+        if (!LegacyAuth::user()->hasGlobalRead()) {
             $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND ';
-            $param = [Auth::id()];
+            $param = [LegacyAuth::id()];
         } else {
             $sql .= ' WHERE ';
             $param = [];
@@ -253,12 +253,12 @@ if (defined('SHOW_SETTINGS')) {
     }
 
     if (($mode == 1 || $mode == 2) && ($config['show_services'] != 0)) {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $service_query = 'select `S`.`service_type`, `S`.`service_id`, `S`.`service_desc`, `S`.`service_status`, `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`os`, `D`.`icon` from services S, devices D where `S`.`device_id` = `D`.`device_id` ORDER BY '.$serviceOrderBy.';';
             $service_par = array();
         } else {
             $service_query = 'select `S`.`service_type`, `S`.`service_id`, `S`.`service_desc`, `S`.`service_status`, `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`os`, `D`.`icon` from services S, devices D, devices_perms P where `S`.`device_id` = `D`.`device_id` AND D.device_id = P.device_id AND P.user_id = ? ORDER BY '.$serviceOrderBy.';';
-            $service_par = array(Auth::id());
+            $service_par = array(LegacyAuth::id());
         }
         $services = dbFetchRows($service_query, $service_par);
         if (count($services) > 0) {
diff --git a/html/includes/common/graylog.inc.php b/html/includes/common/graylog.inc.php
index d520f903a5..c99c802bac 100644
--- a/html/includes/common/graylog.inc.php
+++ b/html/includes/common/graylog.inc.php
@@ -17,7 +17,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (empty($results_limit)) {
     $results_limit = 25;
@@ -55,10 +55,10 @@ if (!empty($filter_device)) {
             "<option value=\"\">All devices</option>"+
 ';
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $results = dbFetchRows("SELECT `hostname` FROM `devices` GROUP BY `hostname` ORDER BY `hostname`");
     } else {
-        $results = dbFetchRows("SELECT `D`.`hostname` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `hostname` ORDER BY `hostname`", array(Auth::id()));
+        $results = dbFetchRows("SELECT `D`.`hostname` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `hostname` ORDER BY `hostname`", array(LegacyAuth::id()));
     }
 
     foreach ($results as $data) {
diff --git a/html/includes/common/server-stats.inc.php b/html/includes/common/server-stats.inc.php
index f14e052291..3fd3dfd890 100644
--- a/html/includes/common/server-stats.inc.php
+++ b/html/includes/common/server-stats.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $device_id = $widget_settings['device'];
 $column = $widget_settings['columnsize'];
@@ -25,12 +25,12 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
             </div>
             <div class="col-sm-6">
                 <select id="device" name="device" class="form-control">';
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT `devices`.`device_id`, `hostname` FROM `devices` WHERE disabled = 0 AND `type` = 'server' ORDER BY `hostname` ASC";
         $param = array();
     } else {
         $sql = "SELECT `devices`.`device_id`, `hostname` FROM `devices` LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id` WHERE disabled = 0 AND `type` = 'server' AND `DP`.`user_id`=? ORDER BY `hostname` ASC";
-        $param = array(Auth::id());
+        $param = array(LegacyAuth::id());
     }
     foreach (dbFetchRows($sql, $param) as $dev) {
         if ($dev['device_id'] == $cur_dev) {
diff --git a/html/includes/common/top-devices.inc.php b/html/includes/common/top-devices.inc.php
index 07ccba7a41..1006d6cd7c 100644
--- a/html/includes/common/top-devices.inc.php
+++ b/html/includes/common/top-devices.inc.php
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $top_query = $widget_settings['top_query'] ?: 'traffic';
 $sort_order = $widget_settings['sort_order'];
@@ -156,11 +156,11 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
     $common_output[] = '<h4>Top ' . $device_count . ' devices (last ' . $interval . ' minutes)</h4>';
 
     $params = ['interval' => $interval_seconds, 'count' => $device_count];
-    if (!Auth::user()->hasGlobalRead()) {
-        $params['user'] = Auth::id();
+    if (!LegacyAuth::user()->hasGlobalRead()) {
+        $params['user'] = LegacyAuth::id();
     }
     if ($top_query === 'traffic') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = '
             SELECT *, sum(p.ifInOctets_rate + p.ifOutOctets_rate) as total
             FROM ports as p, devices as d
@@ -187,7 +187,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
             ';
         }
     } elseif ($top_query === 'uptime') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `uptime`, `hostname`, `last_polled`, `device_id`, `sysName` 
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
@@ -203,7 +203,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       LIMIT :count';
         }
     } elseif ($top_query === 'ping') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `last_ping_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
@@ -219,7 +219,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       LIMIT :count';
         }
     } elseif ($top_query === 'cpu') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, avg(`processor_usage`) as `cpuload`, `d`.`sysName`
                       FROM `processors` AS `procs`, `devices` AS `d` 
                       WHERE `d`.`device_id` = `procs`.`device_id` 
@@ -237,7 +237,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       LIMIT :count';
         }
     } elseif ($top_query === 'ram') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `mempool_perc`, `d`.`sysName`
                       FROM `mempools` as `mem`, `devices` as `d`
                       WHERE `d`.`device_id` = `mem`.`device_id`
@@ -255,7 +255,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       LIMIT :count';
         }
     } elseif ($top_query === 'storage') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `hostname`, `last_polled`, `d`.`device_id`, `storage_perc`, `d`.`sysName`, `storage_descr`, `storage_perc_warn`, `storage_id`
                       FROM `storage` as `disk`, `devices` as `d`
                       WHERE `d`.`device_id` = `disk`.`device_id`
@@ -273,7 +273,7 @@ if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
                       LIMIT :count';
         }
     } elseif ($top_query === 'poller') {
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $query = 'SELECT `last_polled_timetaken`, `hostname`, `last_polled`, `device_id`, `sysName`
                       FROM `devices` 
                       WHERE unix_timestamp() - UNIX_TIMESTAMP(`last_polled`) < :interval 
diff --git a/html/includes/common/top-interfaces.inc.php b/html/includes/common/top-interfaces.inc.php
index c09e70dba1..82b708462b 100644
--- a/html/includes/common/top-interfaces.inc.php
+++ b/html/includes/common/top-interfaces.inc.php
@@ -25,7 +25,7 @@
  * @subpackage Widgets
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (defined('SHOW_SETTINGS') || empty($widget_settings)) {
     $common_output[] = '
@@ -102,11 +102,11 @@ $(function() {
     (integer) $lastpoll_seconds = ($interval * 60) ?: 300;
     (integer) $interface_count = $widget_settings['interface_count'] ?: 5;
     $params = ['lastpoll' => $lastpoll_seconds, 'count' => $interface_count, 'filter1' => ($widget_settings['interface_filter']?:(int)1), 'filter2' => ($widget_settings['interface_filter']?:(int)1)];
-    if (!Auth::user()->hasGlobalRead()) {
-        $params['user1'] = Auth::id();
-        $params['user2'] = Auth::id();
+    if (!LegacyAuth::user()->hasGlobalRead()) {
+        $params['user1'] = LegacyAuth::id();
+        $params['user2'] = LegacyAuth::id();
     }
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $query = '
             SELECT p.*, devices.*, p.ifInOctets_rate + p.ifOutOctets_rate as total
             FROM ports as p
diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index bd7b560c5c..4d9fc938e9 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Frontpage
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 
 require_once $config['install_dir'] . '/includes/alerts.inc.php';
@@ -171,7 +171,7 @@ var greenMarker = L.AwesomeMarkers.icon({
         $status_select = explode(',', $widget_settings['status']);
 
         // Checking user permissions
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
         // Admin or global read-only - show all devices
             $sql = "SELECT DISTINCT(`device_id`),`devices`.`location`,`sysName`,`hostname`,`os`,`status`,`lat`,`lng` FROM `devices`
                     LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location`
@@ -188,7 +188,7 @@ var greenMarker = L.AwesomeMarkers.icon({
                     AND `devices`.`device_id` = `devices_perms`.`device_id`
                     AND `devices_perms`.`user_id` = ? AND `status` IN " . dbGenPlaceholders(count($status_select)) .
                     " ORDER BY `status` ASC, `hostname`";
-            $param = array_merge([Auth::id()], $status_select);
+            $param = array_merge([LegacyAuth::id()], $status_select);
         }
 
         foreach (dbFetchRows($sql, $param) as $map_devices) {
diff --git a/html/includes/forms/ack-alert.inc.php b/html/includes/forms/ack-alert.inc.php
index 6c760239e4..e89a0ebe9e 100644
--- a/html/includes/forms/ack-alert.inc.php
+++ b/html/includes/forms/ack-alert.inc.php
@@ -23,7 +23,7 @@
  * @author     Neil Lathwood <gh+n@laf.io>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 
 header('Content-type: application/json');
@@ -49,7 +49,7 @@ if (!is_numeric($alert_id)) {
         $open  = 1;
     }
 
-    $username = Auth::user()->username;
+    $username = LegacyAuth::user()->username;
     $data = ['state' => $state, 'open' => $open];
     $note = dbFetchCell('SELECT note FROM alerts WHERE id=?', [$alert_id]);
     if (!empty($note)) {
diff --git a/html/includes/forms/add-dashboard.inc.php b/html/includes/forms/add-dashboard.inc.php
index aa60553608..0314c56ebe 100644
--- a/html/includes/forms/add-dashboard.inc.php
+++ b/html/includes/forms/add-dashboard.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Dashboards
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -31,7 +31,7 @@ $message   = 'unknown error';
 
 $dashboard_name = display($_REQUEST['dashboard_name']);
 
-if (!empty($dashboard_name) && ($dash_id = dbInsert(['dashboard_name' => $dashboard_name, 'user_id' => Auth::id()], 'dashboards'))) {
+if (!empty($dashboard_name) && ($dash_id = dbInsert(['dashboard_name' => $dashboard_name, 'user_id' => LegacyAuth::id()], 'dashboards'))) {
     $status  = 'ok';
     $message = 'Created';
 } else {
diff --git a/html/includes/forms/alert-rules.inc.php b/html/includes/forms/alert-rules.inc.php
index e0afc5d7f8..49e3dfc7ea 100644
--- a/html/includes/forms/alert-rules.inc.php
+++ b/html/includes/forms/alert-rules.inc.php
@@ -24,11 +24,11 @@
  */
 
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'ERROR: You need to be admin',
diff --git a/html/includes/forms/alert-templates.inc.php b/html/includes/forms/alert-templates.inc.php
index b93e5745f2..b8fc4151d0 100644
--- a/html/includes/forms/alert-templates.inc.php
+++ b/html/includes/forms/alert-templates.inc.php
@@ -22,14 +22,14 @@
  * @subpackage Alerts
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $status = 'error';
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-Type: application/json');
     $response = array('status' => $status, 'message' => 'You need to be admin');
-    die(_json_encode($response));
+    die(json_encode($response));
 }
 
 $template_id = 0;
diff --git a/html/includes/forms/alert-transports.inc.php b/html/includes/forms/alert-transports.inc.php
index 7f86e400f7..77131dc2b1 100644
--- a/html/includes/forms/alert-transports.inc.php
+++ b/html/includes/forms/alert-transports.inc.php
@@ -23,18 +23,16 @@
  * @author     Vivia Nguyen-Tran <vivia@ualberta.ca>
  */
 
-use LibreNMS\Authentication\Auth;
-use Illuminate\Database\Capsule\Manager as Capsule;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Translation\FileLoader;
 use Illuminate\Translation\Translator;
-use Illuminate\Validation\DatabasePresenceVerifier;
 use Illuminate\Validation\Factory;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin'
diff --git a/html/includes/forms/application-update.inc.php b/html/includes/forms/application-update.inc.php
index a10184c2ed..810a8567ff 100644
--- a/html/includes/forms/application-update.inc.php
+++ b/html/includes/forms/application-update.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = array('status' => 1, 'message' => 'You need to be admin');
 } else {
     $device_id = $_POST['device_id'];
diff --git a/html/includes/forms/attach-alert-template.inc.php b/html/includes/forms/attach-alert-template.inc.php
index a99c8a6140..96162abb5f 100644
--- a/html/includes/forms/attach-alert-template.inc.php
+++ b/html/includes/forms/attach-alert-template.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/callback-clear.inc.php b/html/includes/forms/callback-clear.inc.php
index f258ff7275..61c3cd9e46 100644
--- a/html/includes/forms/callback-clear.inc.php
+++ b/html/includes/forms/callback-clear.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/callback-statistics.inc.php b/html/includes/forms/callback-statistics.inc.php
index 830a1e35a1..a698cd9a69 100644
--- a/html/includes/forms/callback-statistics.inc.php
+++ b/html/includes/forms/callback-statistics.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/component.inc.php b/html/includes/forms/component.inc.php
index 290855b6dc..fc3ae138e7 100644
--- a/html/includes/forms/component.inc.php
+++ b/html/includes/forms/component.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/config-item-disable.inc.php b/html/includes/forms/config-item-disable.inc.php
index a29e50b8c6..f8d4d4430b 100644
--- a/html/includes/forms/config-item-disable.inc.php
+++ b/html/includes/forms/config-item-disable.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/config-item-update.inc.php b/html/includes/forms/config-item-update.inc.php
index 23d78c5ab4..b2e994da25 100644
--- a/html/includes/forms/config-item-update.inc.php
+++ b/html/includes/forms/config-item-update.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/config-item.inc.php b/html/includes/forms/config-item.inc.php
index 1deb89a147..6718661f3d 100644
--- a/html/includes/forms/config-item.inc.php
+++ b/html/includes/forms/config-item.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/convert-template.inc.php b/html/includes/forms/convert-template.inc.php
index f55a72c414..432a2a528e 100644
--- a/html/includes/forms/convert-template.inc.php
+++ b/html/includes/forms/convert-template.inc.php
@@ -24,11 +24,11 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin',
diff --git a/html/includes/forms/create-alert-item.inc.php b/html/includes/forms/create-alert-item.inc.php
index 0f34aee594..0da17c6758 100644
--- a/html/includes/forms/create-alert-item.inc.php
+++ b/html/includes/forms/create-alert-item.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/create-device-group.inc.php b/html/includes/forms/create-device-group.inc.php
index 66b3255732..e7c675f456 100644
--- a/html/includes/forms/create-device-group.inc.php
+++ b/html/includes/forms/create-device-group.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/create-service.inc.php b/html/includes/forms/create-service.inc.php
index c755035703..d124a0296a 100644
--- a/html/includes/forms/create-service.inc.php
+++ b/html/includes/forms/create-service.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/delete-alert-rule.inc.php b/html/includes/forms/delete-alert-rule.inc.php
index a5bd64819e..3e68a9e762 100644
--- a/html/includes/forms/delete-alert-rule.inc.php
+++ b/html/includes/forms/delete-alert-rule.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/delete-alert-template.inc.php b/html/includes/forms/delete-alert-template.inc.php
index 2557aae550..3e218a0a45 100644
--- a/html/includes/forms/delete-alert-template.inc.php
+++ b/html/includes/forms/delete-alert-template.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/delete-alert-transport.inc.php b/html/includes/forms/delete-alert-transport.inc.php
index 49b8d28237..fa3ee7c32c 100644
--- a/html/includes/forms/delete-alert-transport.inc.php
+++ b/html/includes/forms/delete-alert-transport.inc.php
@@ -10,11 +10,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin.'
diff --git a/html/includes/forms/delete-cluster-poller.inc.php b/html/includes/forms/delete-cluster-poller.inc.php
index 5d4662cb46..c06ea1896f 100644
--- a/html/includes/forms/delete-cluster-poller.inc.php
+++ b/html/includes/forms/delete-cluster-poller.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = array('status' =>1, 'message' => 'ERROR: You need to be admin to delete poller entries');
 } else {
     $id = $vars['id'];
diff --git a/html/includes/forms/delete-dashboard.inc.php b/html/includes/forms/delete-dashboard.inc.php
index 20feb5e7ce..d8c0ecee38 100644
--- a/html/includes/forms/delete-dashboard.inc.php
+++ b/html/includes/forms/delete-dashboard.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Dashboards
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -32,8 +32,8 @@ $message   = 'unknown error';
 $dashboard_id = (int)$_REQUEST['dashboard_id'];
 
 if ($dashboard_id) {
-    dbDelete('users_widgets', 'user_id = ? && dashboard_id = ?', [Auth::id(), $dashboard_id]);
-    if (dbDelete('dashboards', 'user_id = ? && dashboard_id = ?', [Auth::id(), $dashboard_id])) {
+    dbDelete('users_widgets', 'user_id = ? && dashboard_id = ?', [LegacyAuth::id(), $dashboard_id]);
+    if (dbDelete('dashboards', 'user_id = ? && dashboard_id = ?', [LegacyAuth::id(), $dashboard_id])) {
         $status  = 'ok';
         $message = 'Deleted dashboard';
     } else {
diff --git a/html/includes/forms/delete-device-group.inc.php b/html/includes/forms/delete-device-group.inc.php
index 53c4f563c2..c5afd7a31f 100644
--- a/html/includes/forms/delete-device-group.inc.php
+++ b/html/includes/forms/delete-device-group.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/delete-host-dependency.inc.php b/html/includes/forms/delete-host-dependency.inc.php
index 7a7defed71..6091179ccf 100644
--- a/html/includes/forms/delete-host-dependency.inc.php
+++ b/html/includes/forms/delete-host-dependency.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = ['status' => 1, 'message' => 'You need to be admin'];
 } else {
     if ($_POST['device_id']) {
diff --git a/html/includes/forms/delete-poller.inc.php b/html/includes/forms/delete-poller.inc.php
index f40b97d935..ec52fd23ad 100644
--- a/html/includes/forms/delete-poller.inc.php
+++ b/html/includes/forms/delete-poller.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = array('status' =>1, 'message' => 'ERROR: You need to be admin to delete poller entries');
 } else {
     $id = $vars['id'];
diff --git a/html/includes/forms/delete-service.inc.php b/html/includes/forms/delete-service.inc.php
index 4f373efed7..966321859a 100644
--- a/html/includes/forms/delete-service.inc.php
+++ b/html/includes/forms/delete-service.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = array('status' =>1, 'message' => 'ERROR: You need to be admin to delete services');
 } else {
     if (!is_numeric($vars['service_id'])) {
diff --git a/html/includes/forms/delete-transport-group.inc.php b/html/includes/forms/delete-transport-group.inc.php
index 2a6a22ca37..b5641e0e0f 100644
--- a/html/includes/forms/delete-transport-group.inc.php
+++ b/html/includes/forms/delete-transport-group.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'ERROR: You need to be admin.'
diff --git a/html/includes/forms/discovery-module-update.inc.php b/html/includes/forms/discovery-module-update.inc.php
index 179a37bfef..9b3c0c9211 100644
--- a/html/includes/forms/discovery-module-update.inc.php
+++ b/html/includes/forms/discovery-module-update.inc.php
@@ -1,12 +1,12 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/edit-dashboard.inc.php b/html/includes/forms/edit-dashboard.inc.php
index 44f1a000a2..1e6df89b85 100644
--- a/html/includes/forms/edit-dashboard.inc.php
+++ b/html/includes/forms/edit-dashboard.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Dashboards
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -34,7 +34,7 @@ $dashboard_name = display($_REQUEST['dashboard_name']);
 $access = $_REQUEST['access'] ? 1 : 0;
 
 if (isset($dashboard_id) && isset($dashboard_name) && isset($access)) {
-    if (dbUpdate(['dashboard_name'=> $dashboard_name,'access'=> $access], 'dashboards', '(user_id = ? || access = 2) && dashboard_id = ?', [Auth::id(), $dashboard_id]) >= 0) {
+    if (dbUpdate(['dashboard_name'=> $dashboard_name,'access'=> $access], 'dashboards', '(user_id = ? || access = 2) && dashboard_id = ?', [LegacyAuth::id(), $dashboard_id]) >= 0) {
         $status  = 'ok';
         $message = 'Updated dashboard';
     } else {
diff --git a/html/includes/forms/get-host-dependencies.inc.php b/html/includes/forms/get-host-dependencies.inc.php
index ae4cd98b0a..48be31d799 100644
--- a/html/includes/forms/get-host-dependencies.inc.php
+++ b/html/includes/forms/get-host-dependencies.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = array('status' => 1, 'message' => 'You need to be admin');
 } else {
     if (isset($_POST['viewtype'])) {
@@ -71,7 +71,7 @@ if (!Auth::user()->hasGlobalAdmin()) {
                     } else {
                         $parent = $myrow['parent'];
                     }
-                    
+
                     $hostname = get_device_name($myrow);
                     array_push($res_arr, array( "deviceid" => $myrow['id'], "hostname" => $myrow['hostname'], "sysname" => $hostname, "parent" => $parent, "parentid" => $myrow['parentid'] ));
                 }
@@ -108,6 +108,6 @@ if (!Auth::user()->hasGlobalAdmin()) {
         }
     }
 }
- 
+
 header('Content-Type: application/json');
 echo _json_encode($status);
diff --git a/html/includes/forms/get-vmlist.inc.php b/html/includes/forms/get-vmlist.inc.php
index c3e51a9f49..e6f668e372 100644
--- a/html/includes/forms/get-vmlist.inc.php
+++ b/html/includes/forms/get-vmlist.inc.php
@@ -16,15 +16,15 @@
  * @author     Aldemir Akpinar <aldemir.akpinar@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $vm_query = "SELECT v.vmwVmDisplayName AS vmname, v.vmwVmState AS powerstat, v.device_id AS deviceid, d.hostname AS physicalsrv, d.sysname AS sysname, v.vmwVmGuestOS AS os, v.vmwVmMemSize AS memory, v.vmwVmCpus AS cpu FROM vminfo AS v LEFT JOIN devices AS d ON v.device_id = d.device_id";
 
 $param = [];
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $vm_query .= ' LEFT JOIN devices_perms AS DP ON d.device_id = DP.device_id';
     $uidwhere = ' AND DP.user_id = ?';
-    $uid = [Auth::id()];
+    $uid = [LegacyAuth::id()];
 } else {
     $uidwhere = '';
     $uid = [];
diff --git a/html/includes/forms/mempool-update.inc.php b/html/includes/forms/mempool-update.inc.php
index 13e498a9a5..8b6f981c8b 100644
--- a/html/includes/forms/mempool-update.inc.php
+++ b/html/includes/forms/mempool-update.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/notifications.inc.php b/html/includes/forms/notifications.inc.php
index 190a69d6f6..fb29bfbe6e 100644
--- a/html/includes/forms/notifications.inc.php
+++ b/html/includes/forms/notifications.inc.php
@@ -22,35 +22,35 @@
  * @subpackage Notifications
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
 $status    = 'error';
 $message   = 'unknown error';
 if (isset($_REQUEST['notification_id']) && isset($_REQUEST['action'])) {
-    if ($_REQUEST['action'] == 'read' && dbInsert(array('notifications_id'=>$_REQUEST['notification_id'],'user_id'=>Auth::id(),'key'=>'read','value'=>1), 'notifications_attribs')) {
+    if ($_REQUEST['action'] == 'read' && dbInsert(array('notifications_id'=>$_REQUEST['notification_id'],'user_id'=>LegacyAuth::id(),'key'=>'read','value'=>1), 'notifications_attribs')) {
         $status  = 'ok';
         $message = 'Set as Read';
-    } elseif ((!Auth::user()->hasGlobalAdmin() || Auth::user()->isDemoUser()) && $_REQUEST['action'] == 'stick' && dbInsert(array('notifications_id'=>$_REQUEST['notification_id'],'user_id'=>Auth::id(),'key'=>'sticky','value'=>1), 'notifications_attribs')) {
+    } elseif ((!LegacyAuth::user()->hasGlobalAdmin() || LegacyAuth::user()->isDemoUser()) && $_REQUEST['action'] == 'stick' && dbInsert(array('notifications_id'=>$_REQUEST['notification_id'],'user_id'=>LegacyAuth::id(),'key'=>'sticky','value'=>1), 'notifications_attribs')) {
         $status  = 'ok';
         $message = 'Set as Sticky';
-    } elseif ((!Auth::user()->hasGlobalAdmin() || Auth::user()->isDemoUser()) && $_REQUEST['action'] == 'unstick' && dbDelete('notifications_attribs', "notifications_id = ? && user_id = ? AND `key`='sticky'", array($_REQUEST['notification_id'],Auth::id()))) {
+    } elseif ((!LegacyAuth::user()->hasGlobalAdmin() || LegacyAuth::user()->isDemoUser()) && $_REQUEST['action'] == 'unstick' && dbDelete('notifications_attribs', "notifications_id = ? && user_id = ? AND `key`='sticky'", array($_REQUEST['notification_id'],LegacyAuth::id()))) {
         $status  = 'ok';
         $message = 'Removed Sticky';
     }
-} elseif ($_REQUEST['action'] == 'create' && (!Auth::user()->hasGlobalAdmin() || Auth::user()->isDemoUser()) && (isset($_REQUEST['title']) && isset($_REQUEST['body']))) {
-    if (dbInsert(array('title'=>$_REQUEST['title'],'body'=>$_REQUEST['body'],'checksum'=>hash('sha512', Auth::id().'.LOCAL.'.$_REQUEST['title']),'source'=>Auth::id()), 'notifications')) {
+} elseif ($_REQUEST['action'] == 'create' && (!LegacyAuth::user()->hasGlobalAdmin() || LegacyAuth::user()->isDemoUser()) && (isset($_REQUEST['title']) && isset($_REQUEST['body']))) {
+    if (dbInsert(array('title'=>$_REQUEST['title'],'body'=>$_REQUEST['body'],'checksum'=>hash('sha512', LegacyAuth::id().'.LOCAL.'.$_REQUEST['title']),'source'=>LegacyAuth::id()), 'notifications')) {
         $status  = 'ok';
         $message = 'Created';
     }
 } elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'read-all-notif') {
-    $unread = dbFetchColumn("SELECT `notifications_id` FROM `notifications` AS N WHERE NOT EXISTS ( SELECT 1 FROM `notifications_attribs` WHERE `notifications_id` = N.`notifications_id` AND `user_id`=? AND `key`='read' AND `value`=1)", array(Auth::id()));
+    $unread = dbFetchColumn("SELECT `notifications_id` FROM `notifications` AS N WHERE NOT EXISTS ( SELECT 1 FROM `notifications_attribs` WHERE `notifications_id` = N.`notifications_id` AND `user_id`=? AND `key`='read' AND `value`=1)", array(LegacyAuth::id()));
     foreach ($unread as $notification_id) {
         dbInsert(
             array(
                 'notifications_id' => $notification_id,
-                'user_id' => Auth::id(),
+                'user_id' => LegacyAuth::id(),
                 'key' => 'read',
                 'value' => 1
             ),
diff --git a/html/includes/forms/override-config.inc.php b/html/includes/forms/override-config.inc.php
index 60fb5faf36..700e405f76 100644
--- a/html/includes/forms/override-config.inc.php
+++ b/html/includes/forms/override-config.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/parse-alert-rule.inc.php b/html/includes/forms/parse-alert-rule.inc.php
index 3517f105e5..e89bbbafc6 100644
--- a/html/includes/forms/parse-alert-rule.inc.php
+++ b/html/includes/forms/parse-alert-rule.inc.php
@@ -13,9 +13,9 @@
  */
 
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/parse-alert-template.inc.php b/html/includes/forms/parse-alert-template.inc.php
index 3e28c023e0..4f3070a04f 100644
--- a/html/includes/forms/parse-alert-template.inc.php
+++ b/html/includes/forms/parse-alert-template.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/parse-device-group.inc.php b/html/includes/forms/parse-device-group.inc.php
index e4f2f43440..ad628a3084 100644
--- a/html/includes/forms/parse-device-group.inc.php
+++ b/html/includes/forms/parse-device-group.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/parse-poller-groups.inc.php b/html/includes/forms/parse-poller-groups.inc.php
index 0b83b5ebfc..9ea36c3a50 100644
--- a/html/includes/forms/parse-poller-groups.inc.php
+++ b/html/includes/forms/parse-poller-groups.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/parse-service.inc.php b/html/includes/forms/parse-service.inc.php
index c3ad3e9f32..d0cdd6368d 100644
--- a/html/includes/forms/parse-service.inc.php
+++ b/html/includes/forms/parse-service.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/parse-template-rules.inc.php b/html/includes/forms/parse-template-rules.inc.php
index e363f32e1a..27a4b0af20 100644
--- a/html/includes/forms/parse-template-rules.inc.php
+++ b/html/includes/forms/parse-template-rules.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/poller-group-remove.inc.php b/html/includes/forms/poller-group-remove.inc.php
index 896cfb3b12..21576de7fc 100644
--- a/html/includes/forms/poller-group-remove.inc.php
+++ b/html/includes/forms/poller-group-remove.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/poller-groups.inc.php b/html/includes/forms/poller-groups.inc.php
index 0db992e979..33053f90f3 100644
--- a/html/includes/forms/poller-groups.inc.php
+++ b/html/includes/forms/poller-groups.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/poller-module-update.inc.php b/html/includes/forms/poller-module-update.inc.php
index fd1a8e6cdc..0b7ff2e6a5 100644
--- a/html/includes/forms/poller-module-update.inc.php
+++ b/html/includes/forms/poller-module-update.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/processor-update.inc.php b/html/includes/forms/processor-update.inc.php
index b92dc8f5c0..4a95778ba2 100644
--- a/html/includes/forms/processor-update.inc.php
+++ b/html/includes/forms/processor-update.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/rediscover-device.inc.php b/html/includes/forms/rediscover-device.inc.php
index e47f61bb8c..9593e47e57 100644
--- a/html/includes/forms/rediscover-device.inc.php
+++ b/html/includes/forms/rediscover-device.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/refresh-oxidized-node.inc.php b/html/includes/forms/refresh-oxidized-node.inc.php
index 0ff9234d58..56395afc29 100644
--- a/html/includes/forms/refresh-oxidized-node.inc.php
+++ b/html/includes/forms/refresh-oxidized-node.inc.php
@@ -13,11 +13,11 @@
 header('Content-type: application/json');
 
 use LibreNMS\Config;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $device_hostname = clean($_POST['device_hostname']);
-if (Auth::user()->hasGlobalAdmin() && isset($device_hostname)) {
-    if (oxidized_node_update($device_hostname, "LibreNMS GUI refresh", $_SESSION['username'])) {
+if (LegacyAuth::user()->hasGlobalAdmin() && isset($device_hostname)) {
+    if (oxidized_node_update($device_hostname, "LibreNMS GUI refresh", LegacyAuth::user()->username)) {
         $status  = 'ok';
         $message = 'Queued refresh in oxidized for device ' . $device_hostname;
     } else {
diff --git a/html/includes/forms/reload-oxidized-nodes-list.inc.php b/html/includes/forms/reload-oxidized-nodes-list.inc.php
index 9803aadfce..1e04eb8883 100644
--- a/html/includes/forms/reload-oxidized-nodes-list.inc.php
+++ b/html/includes/forms/reload-oxidized-nodes-list.inc.php
@@ -10,9 +10,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = 'error';
     $message = 'ERROR: You need to be admin to reload Oxidized node list';
 } else {
diff --git a/html/includes/forms/save-host-dependency.inc.php b/html/includes/forms/save-host-dependency.inc.php
index f041ef4d62..5a228ef4c2 100644
--- a/html/includes/forms/save-host-dependency.inc.php
+++ b/html/includes/forms/save-host-dependency.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $status = ['status' => 1, 'message' => 'You need to be admin'];
 } else {
     $parent_ids = (array)$_POST['parent_ids'];
diff --git a/html/includes/forms/schedule-maintenance.inc.php b/html/includes/forms/schedule-maintenance.inc.php
index 5babc54ef9..7187ae3e9e 100644
--- a/html/includes/forms/schedule-maintenance.inc.php
+++ b/html/includes/forms/schedule-maintenance.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
@@ -51,7 +51,7 @@ if ($sub_type == 'new-maintenance') {
     if (!in_array($recurring, array(0,1))) {
         $message .= 'Missing recurring choice<br />';
     }
-    
+
     // check values if recurring is set to yes
     if ($recurring == 1) {
         if (empty($start_recurring_dt)) {
@@ -72,21 +72,21 @@ if ($sub_type == 'new-maintenance') {
         } else {
             $end_recurring_dt = null;
         }
-        
+
         if (empty($start_recurring_hr)) {
             $message .= 'Missing start recurring hour<br />';
         }
-                
+
         if (empty($end_recurring_hr)) {
             $message .= 'Missing end recurring hour<br />';
         }
-        
+
         if (isset($_POST['recurring_day']) && is_array($_POST['recurring_day']) && !empty($_POST['recurring_day'])) {
             $recurring_day = implode(',', $_POST['recurring_day']);
         } else {
             $recurring_day = null;
         }
-        
+
         // recurring = 1 => empty no reccurency values to be sure.
         $start = '0000-00-00 00:00:00';
         $end = '0000-00-00 00:00:00';
@@ -94,11 +94,11 @@ if ($sub_type == 'new-maintenance') {
         if (empty($start)) {
             $message .= 'Missing start date<br />';
         }
-    
+
         if (empty($end)) {
             $message .= 'Missing end date<br />';
         }
-        
+
         // recurring = 0 => empty no reccurency values to be sure.
         $start_recurring_dt = '1970-01-02';
         $end_recurring_dt = '1970-01-02';
diff --git a/html/includes/forms/sensor-alert-reset.inc.php b/html/includes/forms/sensor-alert-reset.inc.php
index 5921272a21..aeef2e4e9d 100644
--- a/html/includes/forms/sensor-alert-reset.inc.php
+++ b/html/includes/forms/sensor-alert-reset.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/sensor-alert-update.inc.php b/html/includes/forms/sensor-alert-update.inc.php
index 9fcac30067..c625faab17 100644
--- a/html/includes/forms/sensor-alert-update.inc.php
+++ b/html/includes/forms/sensor-alert-update.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/sensor-update.inc.php b/html/includes/forms/sensor-update.inc.php
index 9566c2b3ca..3a8215bb27 100644
--- a/html/includes/forms/sensor-update.inc.php
+++ b/html/includes/forms/sensor-update.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/show-alert-transport.inc.php b/html/includes/forms/show-alert-transport.inc.php
index 4585f92538..078ccda8e3 100644
--- a/html/includes/forms/show-alert-transport.inc.php
+++ b/html/includes/forms/show-alert-transport.inc.php
@@ -10,11 +10,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin'
diff --git a/html/includes/forms/show-transport-group.inc.php b/html/includes/forms/show-transport-group.inc.php
index 935746baa5..e75ff1c50e 100644
--- a/html/includes/forms/show-transport-group.inc.php
+++ b/html/includes/forms/show-transport-group.inc.php
@@ -10,11 +10,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin'
diff --git a/html/includes/forms/sql-from-alert-collection.inc.php b/html/includes/forms/sql-from-alert-collection.inc.php
index f2d2bfb87e..5fa2adc9a9 100644
--- a/html/includes/forms/sql-from-alert-collection.inc.php
+++ b/html/includes/forms/sql-from-alert-collection.inc.php
@@ -24,11 +24,11 @@
  */
 
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'ERROR: You need to be admin',
diff --git a/html/includes/forms/storage-update.inc.php b/html/includes/forms/storage-update.inc.php
index c538e4fb12..4fc32978bd 100644
--- a/html/includes/forms/storage-update.inc.php
+++ b/html/includes/forms/storage-update.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/test-transport.inc.php b/html/includes/forms/test-transport.inc.php
index fae3d44e1b..59f12d3362 100644
--- a/html/includes/forms/test-transport.inc.php
+++ b/html/includes/forms/test-transport.inc.php
@@ -12,10 +12,10 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/token-item-create.inc.php b/html/includes/forms/token-item-create.inc.php
index 07a9545ff6..877db765ea 100644
--- a/html/includes/forms/token-item-create.inc.php
+++ b/html/includes/forms/token-item-create.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/token-item-disable.inc.php b/html/includes/forms/token-item-disable.inc.php
index 53571f4b05..1fee651357 100644
--- a/html/includes/forms/token-item-disable.inc.php
+++ b/html/includes/forms/token-item-disable.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/token-item-remove.inc.php b/html/includes/forms/token-item-remove.inc.php
index 113935e26e..940ecc4074 100644
--- a/html/includes/forms/token-item-remove.inc.php
+++ b/html/includes/forms/token-item-remove.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/transport-groups.inc.php b/html/includes/forms/transport-groups.inc.php
index a9c7a663e1..29b1dec05b 100644
--- a/html/includes/forms/transport-groups.inc.php
+++ b/html/includes/forms/transport-groups.inc.php
@@ -23,11 +23,11 @@
  * @author     Vivia Nguyen-Tran <vivia@ualberta.ca>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die(json_encode([
         'status' => 'error',
         'message' => 'You need to be admin'
diff --git a/html/includes/forms/update-alert-rule.inc.php b/html/includes/forms/update-alert-rule.inc.php
index 2370ebe636..00b489c2bf 100644
--- a/html/includes/forms/update-alert-rule.inc.php
+++ b/html/includes/forms/update-alert-rule.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/update-config-item.inc.php b/html/includes/forms/update-config-item.inc.php
index 96a57aabda..9cfa3e791f 100644
--- a/html/includes/forms/update-config-item.inc.php
+++ b/html/includes/forms/update-config-item.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     header('Content-type: text/plain');
     die('ERROR: You need to be admin');
 }
diff --git a/html/includes/forms/update-dashboard-config.inc.php b/html/includes/forms/update-dashboard-config.inc.php
index b357545ba3..6f5d55dda4 100644
--- a/html/includes/forms/update-dashboard-config.inc.php
+++ b/html/includes/forms/update-dashboard-config.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -13,7 +13,7 @@ $widget_id = mres($_POST['widget_id']);
 $dasboard_id = mres($_POST['dashboard_id']);
 
 if ($sub_type == 'remove' && is_numeric($widget_id)) {
-    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(Auth::id(),$dasboard_id)) == 1) {
+    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(LegacyAuth::id(),$dasboard_id)) == 1) {
         if ($widget_id == 0 || dbDelete('users_widgets', '`user_widget_id`=? AND `dashboard_id`=?', array($widget_id,$dasboard_id))) {
             $status = 'ok';
             $message = '';
@@ -23,7 +23,7 @@ if ($sub_type == 'remove' && is_numeric($widget_id)) {
         $message = 'ERROR: You have no write access.';
     }
 } elseif ($sub_type == 'remove-all') {
-    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(Auth::id(),$dasboard_id)) == 1) {
+    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(LegacyAuth::id(),$dasboard_id)) == 1) {
         if (dbDelete('users_widgets', '`dashboard_id`=?', array($dasboard_id))) {
             $status = 'ok';
             $message = '';
@@ -33,11 +33,11 @@ if ($sub_type == 'remove' && is_numeric($widget_id)) {
         $message = 'ERROR: You have no write access.';
     }
 } elseif ($sub_type == 'add' && is_numeric($widget_id)) {
-    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(Auth::id(),$dasboard_id)) == 1) {
+    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(LegacyAuth::id(),$dasboard_id)) == 1) {
         $widget = dbFetchRow('SELECT * FROM `widgets` WHERE `widget_id`=?', array($widget_id));
         if (is_array($widget)) {
             list($x,$y) = explode(',', $widget['base_dimensions']);
-            $item_id = dbInsert(array('user_id'=>Auth::id(),'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y,'settings'=>'','dashboard_id'=>$dasboard_id), 'users_widgets');
+            $item_id = dbInsert(array('user_id'=>LegacyAuth::id(),'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y,'settings'=>'','dashboard_id'=>$dasboard_id), 'users_widgets');
             if (is_numeric($item_id)) {
                 $extra = array('user_widget_id'=>$item_id,'widget_id'=>$item_id,'title'=>$widget['widget_title'],'widget'=>$widget['widget'],'refresh'=>60,'size_x'=>$x,'size_y'=>$y);
                 $status = 'ok';
@@ -49,7 +49,7 @@ if ($sub_type == 'remove' && is_numeric($widget_id)) {
         $message = 'ERROR: You have no write access.';
     }
 } else {
-    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(Auth::id(),$dasboard_id)) == 1) {
+    if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?', array(LegacyAuth::id(),$dasboard_id)) == 1) {
         $status = 'ok';
         $message = '';
         foreach ($data as $line) {
diff --git a/html/includes/forms/update-notes.inc.php b/html/includes/forms/update-notes.inc.php
index ba6f4ee58f..e52a091b59 100644
--- a/html/includes/forms/update-notes.inc.php
+++ b/html/includes/forms/update-notes.inc.php
@@ -10,7 +10,7 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -20,7 +20,7 @@ $message   = 'unknown error';
 $device_id = mres($_POST['device_id']);
 $notes = $_POST['notes'];
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $message = 'Only admin accounts can update notes';
 } elseif (isset($notes) && (dbUpdate(array('notes' => $notes), 'devices', 'device_id = ?', array($device_id)))) {
     $status  = 'ok';
diff --git a/html/includes/forms/update-ports.inc.php b/html/includes/forms/update-ports.inc.php
index a60e4e112b..597689ae33 100644
--- a/html/includes/forms/update-ports.inc.php
+++ b/html/includes/forms/update-ports.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $response = array(
         'status'  => 'error',
         'message' => 'Need to be admin',
diff --git a/html/includes/forms/widget-settings.inc.php b/html/includes/forms/widget-settings.inc.php
index 64a86dc71e..c0f6ec3f12 100644
--- a/html/includes/forms/widget-settings.inc.php
+++ b/html/includes/forms/widget-settings.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Widgets
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: application/json');
 
@@ -38,7 +38,7 @@ if ($widget_id < 1) {
     if (!is_array($widget_settings)) {
         $widget_settings = array();
     }
-    if (dbFetchCell('select 1 from users_widgets inner join dashboards on users_widgets.dashboard_id = dashboards.dashboard_id where user_widget_id = ? && (users_widgets.user_id = ? || dashboards.access = 2)', array($widget_id,Auth::id())) == 1) {
+    if (dbFetchCell('select 1 from users_widgets inner join dashboards on users_widgets.dashboard_id = dashboards.dashboard_id where user_widget_id = ? && (users_widgets.user_id = ? || dashboards.access = 2)', array($widget_id,LegacyAuth::id())) == 1) {
         if (dbUpdate(array('settings'=>json_encode($widget_settings)), 'users_widgets', 'user_widget_id=?', array($widget_id)) >= 0) {
             $status  = 'ok';
             $message = 'Updated';
diff --git a/html/includes/forms/wireless-sensor-alert-reset.inc.php b/html/includes/forms/wireless-sensor-alert-reset.inc.php
index 846ca64929..53af9ead30 100644
--- a/html/includes/forms/wireless-sensor-alert-reset.inc.php
+++ b/html/includes/forms/wireless-sensor-alert-reset.inc.php
@@ -13,13 +13,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/wireless-sensor-alert-update.inc.php b/html/includes/forms/wireless-sensor-alert-update.inc.php
index 78952c0302..2d240e5a65 100644
--- a/html/includes/forms/wireless-sensor-alert-update.inc.php
+++ b/html/includes/forms/wireless-sensor-alert-update.inc.php
@@ -13,13 +13,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/forms/wireless-sensor-update.inc.php b/html/includes/forms/wireless-sensor-update.inc.php
index 1de86d06ea..e53102225b 100644
--- a/html/includes/forms/wireless-sensor-update.inc.php
+++ b/html/includes/forms/wireless-sensor-update.inc.php
@@ -13,13 +13,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 header('Content-type: text/plain');
 
 // FUA
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/front/top_device_bits.inc.php b/html/includes/front/top_device_bits.inc.php
index 9e5bc52978..0ab2af3044 100644
--- a/html/includes/front/top_device_bits.inc.php
+++ b/html/includes/front/top_device_bits.inc.php
@@ -13,12 +13,12 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $minutes = 15;
 $seconds = ($minutes * 60);
 $top     = $config['front_page_settings']['top']['devices'];
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $query = "
         SELECT *, sum(p.ifInOctets_rate + p.ifOutOctets_rate) as total
         FROM ports as p, devices as d
@@ -43,7 +43,7 @@ if (Auth::user()->hasGlobalRead()) {
         ORDER BY total desc
         LIMIT $top
         ";
-    $param[] = array(Auth::id());
+    $param[] = array(LegacyAuth::id());
 }//end if
 
 echo "<strong>Top $top devices (last $minutes minutes)</strong>\n";
diff --git a/html/includes/front/top_ports.inc.php b/html/includes/front/top_ports.inc.php
index 9f3f9fe74f..c6d9d74a6a 100644
--- a/html/includes/front/top_ports.inc.php
+++ b/html/includes/front/top_ports.inc.php
@@ -13,12 +13,12 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $minutes = 15;
 $seconds = ($minutes * 60);
 $top     = $config['front_page_settings']['top']['ports'];
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $query = "
         SELECT *, p.ifInOctets_rate + p.ifOutOctets_rate as total
         FROM ports as p, devices as d
@@ -43,8 +43,8 @@ if (Auth::user()->hasGlobalRead()) {
         LIMIT $top
         ";
     $param[] = array(
-        Auth::id(),
-        Auth::id(),
+        LegacyAuth::id(),
+        LegacyAuth::id(),
     );
 }//end if
 
diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index c17c52a97e..233becbbe0 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -12,7 +12,7 @@
  * @copyright  (C) 2013 LibreNMS Group
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 /**
  * Compare $t with the value of $vars[$v], if that exists
@@ -452,7 +452,7 @@ function bill_permitted($bill_id)
 {
     global $permissions;
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $allowed = true;
     } elseif ($permissions['bill'][$bill_id]) {
         $allowed = true;
@@ -472,7 +472,7 @@ function port_permitted($port_id, $device_id = null)
         $device_id = get_device_id_by_port_id($port_id);
     }
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $allowed = true;
     } elseif (device_permitted($device_id)) {
         $allowed = true;
@@ -495,7 +495,7 @@ function application_permitted($app_id, $device_id = null)
             $device_id = get_device_id_by_app_id($app_id);
         }
 
-        if (Auth::user()->hasGlobalRead()) {
+        if (LegacyAuth::user()->hasGlobalRead()) {
             $allowed = true;
         } elseif (device_permitted($device_id)) {
             $allowed = true;
@@ -516,7 +516,7 @@ function device_permitted($device_id)
 {
     global $permissions;
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $allowed = true;
     } elseif ($permissions['device'][$device_id]) {
         $allowed = true;
@@ -883,10 +883,10 @@ function getlocations()
     $locations = array();
 
     // Fetch regular locations
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $rows = dbFetchRows('SELECT location FROM devices AS D GROUP BY location ORDER BY location');
     } else {
-        $rows = dbFetchRows('SELECT location FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? GROUP BY location ORDER BY location', array(Auth::id()));
+        $rows = dbFetchRows('SELECT location FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? GROUP BY location ORDER BY location', array(LegacyAuth::id()));
     }
 
     foreach ($rows as $row) {
@@ -1640,18 +1640,18 @@ function get_dashboards($user_id = null)
     $default = get_user_pref('dashboard');
     $dashboards = dbFetchRows(
         "SELECT * FROM `dashboards` WHERE dashboards.access > 0 || dashboards.user_id = ?",
-        array(is_null($user_id) ? Auth::id() : $user_id)
+        array(is_null($user_id) ? LegacyAuth::id() : $user_id)
     );
 
     $usernames = array(
-        Auth::id() => Auth::user()->username
+        LegacyAuth::id() => LegacyAuth::user()->username
     );
 
     $result = array();
     foreach ($dashboards as $dashboard) {
         $duid = $dashboard['user_id'];
         if (!isset($usernames[$duid])) {
-            $user = Auth::get()->getUser($duid);
+            $user = LegacyAuth::get()->getUser($duid);
             $usernames[$duid] = $user['username'];
         }
 
diff --git a/html/includes/graphs/customer/auth.inc.php b/html/includes/graphs/customer/auth.inc.php
index 5eb66b4a9b..979ec5e916 100644
--- a/html/includes/graphs/customer/auth.inc.php
+++ b/html/includes/graphs/customer/auth.inc.php
@@ -1,9 +1,9 @@
 <?php
 
 // FIXME - wtfbbq
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead() || $auth) {
+if (LegacyAuth::user()->hasGlobalRead() || $auth) {
     $id    = mres($vars['id']);
     $title = generate_device_link($device);
     $auth  = true;
diff --git a/html/includes/graphs/global/auth.inc.php b/html/includes/graphs/global/auth.inc.php
index 2503ea1bdd..b46ede79ff 100644
--- a/html/includes/graphs/global/auth.inc.php
+++ b/html/includes/graphs/global/auth.inc.php
@@ -1,7 +1,7 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $auth = 1;
 }
diff --git a/html/includes/hostbox-public.inc.php b/html/includes/hostbox-public.inc.php
deleted file mode 100644
index 776654acc4..0000000000
--- a/html/includes/hostbox-public.inc.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of LibreNMS
- *
- * Copyright (c) 2014 Bohdan Sanders <http://bohdans.com/>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version. Please see LICENSE.txt at the top level of
- * the source code distribution for details.
- */
-
-if ($bg == $config['list_colour']['odd']) {
-    $bg = $config['list_colour']['even'];
-} else {
-    $bg = $config['list_colour']['odd'];
-}
-
-if ($device['status'] == '0') {
-    $class = 'bg-danger';
-} else {
-    $class = 'bg-primary';
-}
-
-if ($device['ignore'] == '1') {
-    $class = 'bg-warning';
-    if ($device['status'] == '1') {
-        $class = 'bg-success';
-    }
-}
-
-if ($device['disabled'] == '1') {
-    $class = 'bg-info';
-}
-
-$type = strtolower($device['os']);
-
-if ($device['os'] == 'ios') {
-    formatCiscoHardware($device, true);
-}
-
-$device['os_text'] = $config['os'][$device['os']]['text'];
-
-echo '  <tr>
-          <td class="'.$class.' "></td>
-          <td>'.$image.'</td>
-          <td><span style="font-size: 15px;">'.generate_device_link($device).'</span></td>';
-
-echo '<td>';
-if ($port_count) {
-    echo ' <i class="fa fa-link fa-lg icon-theme" aria-hidden="true"></i> '.$port_count;
-}
-
-echo '<br />';
-if ($sensor_count) {
-    echo ' <i class="fa fa-tachometer fa-lg icon-theme" aria-hidden="true"></i> '.$sensor_count;
-}
-
-echo '</td>';
-echo '    <td>'.$device['hardware'].' '.$device['features'].'</td>';
-echo '    <td>'.formatUptime($device['uptime'], 'short').' <br />';
-
-echo '    '.substr($device['location'], 0, 32).'</td>';
-
-echo ' </tr>';
diff --git a/html/includes/list/devices.inc.php b/html/includes/list/devices.inc.php
index 45e71657ea..a51610fab5 100644
--- a/html/includes/list/devices.inc.php
+++ b/html/includes/list/devices.inc.php
@@ -23,16 +23,16 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $query = '';
 $where = [];
 $params = [];
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $query .= ' LEFT JOIN `devices_perms` USING (`device_id`)';
     $where = '`devices_perms`.`user_id`=?';
-    $params[] = Auth::id();
+    $params[] = LegacyAuth::id();
 }
 
 if (!empty($_REQUEST['search'])) {
diff --git a/html/includes/list/groups.inc.php b/html/includes/list/groups.inc.php
index 5bf764a0a7..3d959c3503 100644
--- a/html/includes/list/groups.inc.php
+++ b/html/includes/list/groups.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     return [];
 }
 
diff --git a/html/includes/list/transport_groups.inc.php b/html/includes/list/transport_groups.inc.php
index 7f9745373b..44130d046b 100644
--- a/html/includes/list/transport_groups.inc.php
+++ b/html/includes/list/transport_groups.inc.php
@@ -23,9 +23,9 @@
  * @author     Vivia Nguyen-Tran <vivia@ualberta>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     return [];
 }
 
diff --git a/html/includes/list/transports.inc.php b/html/includes/list/transports.inc.php
index e9c3911abe..73a2b66625 100644
--- a/html/includes/list/transports.inc.php
+++ b/html/includes/list/transports.inc.php
@@ -23,9 +23,9 @@
  * @author     Vivia Nguyen-Tran <vivia@ualberta>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     return [];
 }
 
diff --git a/html/includes/modal/alert_rule_collection.inc.php b/html/includes/modal/alert_rule_collection.inc.php
index dfb4453fec..69e66f1bff 100644
--- a/html/includes/modal/alert_rule_collection.inc.php
+++ b/html/includes/modal/alert_rule_collection.inc.php
@@ -23,9 +23,9 @@
  * @author     Neil Lathwood <neil@lathwood.co.uk>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/alert_schedule.inc.php b/html/includes/modal/alert_schedule.inc.php
index a62eb99916..567e71cbbb 100644
--- a/html/includes/modal/alert_schedule.inc.php
+++ b/html/includes/modal/alert_schedule.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
 ?>
 
 <div class="modal fade bs-example-modal-sm" id="schedule-maintenance" tabindex="-1" role="dialog" aria-labelledby="Create" aria-hidden="true">
@@ -48,7 +48,7 @@ if (Auth::user()->hasGlobalAdmin()) {
                     </div>
                     <div class="form-group">
                         <label for="recurring" class="col-sm-4 control-label">Recurring <strong class="text-danger">*</strong>: </label>
-                        <div class="col-sm-8"> 
+                        <div class="col-sm-8">
                             <label class="radio-inline">
                                 <input type="radio" id="recurring0" name="recurring" value="0" checked="checked"/> No
                             </label>
@@ -177,11 +177,11 @@ $('#schedule-maintenance').on('show.bs.modal', function (event) {
                 $('#notes').val(output['notes']);
                 if (output['recurring'] == 0){
                     $('#start').val(output['start']);
-                    $('#end').val(output['end']);                    
+                    $('#end').val(output['end']);
 
                     $('#norecurringgroup').show();
                     $('#recurringgroup').hide();
-                    
+
                     $('#start_recurring_dt').val('');
                     $('#end_recurring_dt').val('');
                     $('#start_recurring_hr').val('');
@@ -189,13 +189,13 @@ $('#schedule-maintenance').on('show.bs.modal', function (event) {
                     $("#recurring0").prop("checked", true);
                     $('#recurring_day').prop('checked', false);
                 }else{
-                    
+
                     $('#start_recurring_dt').val(output['start_recurring_dt']);
                     $('#end_recurring_dt').val(output['end_recurring_dt']);
                     $('#start_recurring_hr').val(output['start_recurring_hr']);
                     $('#end_recurring_hr').val(output['end_recurring_hr']);
                     $("#recurring1").prop("checked", true);
-                    
+
                     var recdayupd = output['recurring_day'];
                     if (recdayupd != ''){
                         var arrayrecdayupd = recdayupd.split(',');
@@ -203,12 +203,12 @@ $('#schedule-maintenance').on('show.bs.modal', function (event) {
                             $("input[name='recurring_day[]'][value="+checkedday+"]").prop('checked', true);
                         });
                     }else{
-                        $('#recurring_day').prop('checked', false);                        
+                        $('#recurring_day').prop('checked', false);
                     }
-                    
+
                     $('#norecurringgroup').hide();
                     $('#recurringgroup').show();
-                    
+
                     $('#start').val('');
                     $('#end').val('');
                 }
@@ -219,7 +219,7 @@ $('#schedule-maintenance').on('show.bs.modal', function (event) {
 });
 
 $('#sched-form input[name=recurring]').on('change', function() {
-    var isrecurring = $('input[name=recurring]:checked', '#sched-form').val(); 
+    var isrecurring = $('input[name=recurring]:checked', '#sched-form').val();
     if (isrecurring == 1){
         $('#norecurringgroup').hide();
         $('#recurringgroup').show();
diff --git a/html/includes/modal/alert_template.inc.php b/html/includes/modal/alert_template.inc.php
index ba84c8e0a8..0f0e110686 100644
--- a/html/includes/modal/alert_template.inc.php
+++ b/html/includes/modal/alert_template.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/attach_alert_template.inc.php b/html/includes/modal/attach_alert_template.inc.php
index 5a8457f4a9..6f8ea71625 100644
--- a/html/includes/modal/attach_alert_template.inc.php
+++ b/html/includes/modal/attach_alert_template.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/delete_alert_rule.inc.php b/html/includes/modal/delete_alert_rule.inc.php
index 05c774728f..dbbd6ad932 100644
--- a/html/includes/modal/delete_alert_rule.inc.php
+++ b/html/includes/modal/delete_alert_rule.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/delete_alert_template.inc.php b/html/includes/modal/delete_alert_template.inc.php
index 3120b1de4f..ed31752b02 100644
--- a/html/includes/modal/delete_alert_template.inc.php
+++ b/html/includes/modal/delete_alert_template.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/delete_device_group.inc.php b/html/includes/modal/delete_device_group.inc.php
index e96453067f..c5f84c0183 100644
--- a/html/includes/modal/delete_device_group.inc.php
+++ b/html/includes/modal/delete_device_group.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/delete_host_dependency.inc.php b/html/includes/modal/delete_host_dependency.inc.php
index f1984a54d3..9f34b241e0 100644
--- a/html/includes/modal/delete_host_dependency.inc.php
+++ b/html/includes/modal/delete_host_dependency.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/delete_poller.inc.php b/html/includes/modal/delete_poller.inc.php
index 8710d799ea..bdd8b5a766 100644
--- a/html/includes/modal/delete_poller.inc.php
+++ b/html/includes/modal/delete_poller.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     ?>
 
     <div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="Delete" aria-hidden="true">
diff --git a/html/includes/modal/delete_service.inc.php b/html/includes/modal/delete_service.inc.php
index db48a384d1..8eb131c095 100644
--- a/html/includes/modal/delete_service.inc.php
+++ b/html/includes/modal/delete_service.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     ?>
 
     <div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="Delete" aria-hidden="true">
diff --git a/html/includes/modal/edit_alert_transport.inc.php b/html/includes/modal/edit_alert_transport.inc.php
index a36a6cb603..afc6d2cd4c 100644
--- a/html/includes/modal/edit_alert_transport.inc.php
+++ b/html/includes/modal/edit_alert_transport.inc.php
@@ -11,10 +11,10 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
 ?>
 <!--Modal for adding or updating an alert transport -->
     <div class="modal fade" id="edit-alert-transport" tabindex="-1" role="dialog"
diff --git a/html/includes/modal/edit_host_dependency.inc.php b/html/includes/modal/edit_host_dependency.inc.php
index aaa7c514b7..25d872367f 100644
--- a/html/includes/modal/edit_host_dependency.inc.php
+++ b/html/includes/modal/edit_host_dependency.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
diff --git a/html/includes/modal/edit_transport_group.inc.php b/html/includes/modal/edit_transport_group.inc.php
index fa0bcbc0a4..c041fc58c0 100644
--- a/html/includes/modal/edit_transport_group.inc.php
+++ b/html/includes/modal/edit_transport_group.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     ?>
 <!--Modal for adding or updating a transport group -->
     <div class="modal fade" id="edit-transport-group" tabindex="-1" role="dialog"
diff --git a/html/includes/modal/manage_host_dependencies.inc.php b/html/includes/modal/manage_host_dependencies.inc.php
index 0fbec181c9..fc0243f39c 100644
--- a/html/includes/modal/manage_host_dependencies.inc.php
+++ b/html/includes/modal/manage_host_dependencies.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     die('ERROR: You need to be admin');
 }
 
@@ -66,7 +66,7 @@ if (!Auth::user()->hasGlobalAdmin()) {
 </div>
 
 <script>
-function changeParents(e, evttype) 
+function changeParents(e, evttype)
 {
     e.preventDefault();
     if (evttype == 'select' && e.params.data.id == 0) {
@@ -75,7 +75,7 @@ function changeParents(e, evttype)
     }
 
     var cur_option = $('#manavailableparents').select2('data');
-    // So that we'll see all devices. 
+    // So that we'll see all devices.
     var device_id = 0;
     var parent_ids = [];
     // This is needed to remove the None option if it is with another parent id
diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php
index 390444fd16..9102ba1acb 100644
--- a/html/includes/modal/new_alert_rule.inc.php
+++ b/html/includes/modal/new_alert_rule.inc.php
@@ -13,9 +13,9 @@
  */
 
 use LibreNMS\Alerting\QueryBuilderFilter;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     $filters = json_encode(new QueryBuilderFilter('alert'));
 
     ?>
diff --git a/html/includes/modal/new_bill.inc.php b/html/includes/modal/new_bill.inc.php
index bad93f9c10..907250cc5f 100644
--- a/html/includes/modal/new_bill.inc.php
+++ b/html/includes/modal/new_bill.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     require 'includes/javascript-interfacepicker.inc.php';
 
     $port_device_id = -1;
diff --git a/html/includes/modal/new_device_group.inc.php b/html/includes/modal/new_device_group.inc.php
index f9f13c4029..58de02a1e4 100644
--- a/html/includes/modal/new_device_group.inc.php
+++ b/html/includes/modal/new_device_group.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
 ?>
 
  <div class="modal fade bs-example-modal-sm" id="create-group" tabindex="-1" role="dialog" aria-labelledby="Create" aria-hidden="true">
diff --git a/html/includes/modal/new_service.inc.php b/html/includes/modal/new_service.inc.php
index cf986f6c63..fb1853a0e7 100644
--- a/html/includes/modal/new_service.inc.php
+++ b/html/includes/modal/new_service.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     // Build the types list.
     $dir = $config['nagios_plugins'];
     if (file_exists($dir) && is_dir($dir)) {
diff --git a/html/includes/modal/poller_groups.inc.php b/html/includes/modal/poller_groups.inc.php
index 59fa97dc54..f355238ff8 100644
--- a/html/includes/modal/poller_groups.inc.php
+++ b/html/includes/modal/poller_groups.inc.php
@@ -11,9 +11,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     echo ('ERROR: You need to be admin');
 } else {
 ?>
diff --git a/html/includes/modal/remove_alert_schedule.inc.php b/html/includes/modal/remove_alert_schedule.inc.php
index 63c0f50a2a..94d7fefa61 100644
--- a/html/includes/modal/remove_alert_schedule.inc.php
+++ b/html/includes/modal/remove_alert_schedule.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
 ?>
 
 <div class="modal fade bs-example-modal-sm" id="delete-maintenance" tabindex="-1" role="dialog" aria-labelledby="delete" aria-hidden="true">
diff --git a/html/includes/output/capture.inc.php b/html/includes/output/capture.inc.php
index 5388463987..93b1f4bb67 100644
--- a/html/includes/output/capture.inc.php
+++ b/html/includes/output/capture.inc.php
@@ -23,9 +23,9 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     echo("Insufficient Privileges");
     exit();
 }
diff --git a/html/includes/output/query.inc.php b/html/includes/output/query.inc.php
index 1223cdf824..5bf89b750d 100644
--- a/html/includes/output/query.inc.php
+++ b/html/includes/output/query.inc.php
@@ -24,9 +24,9 @@
  */
 
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     echo("Insufficient Privileges");
     exit();
 }
diff --git a/html/includes/print-alert-rules.php b/html/includes/print-alert-rules.php
index 84eb2e6a9f..21626ed3a1 100644
--- a/html/includes/print-alert-rules.php
+++ b/html/includes/print-alert-rules.php
@@ -1,7 +1,7 @@
 <?php
 
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -74,7 +74,7 @@ echo '<div class="table-responsive">
     </tr>';
 
 echo '<td colspan="7">';
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo '<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#create-alert" data-device_id="'.$device['device_id'].'"><i class="fa fa-plus"></i> Create new alert rule</button>';
     echo '<i> - OR - </i>';
     echo '<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#search_rule_modal" data-device_id="'.$device['device_id'].'"><i class="fa fa-plus"></i> Create rule from collection</button>';
@@ -190,13 +190,13 @@ foreach (dbFetchRows($full_query, $param) as $rule) {
 
     echo '<td><small>Max: '.$rule_extra['count'].'<br />Delay: '.$rule_extra['delay'].'<br />Interval: '.$rule_extra['interval'].'</small></td>';
     echo '<td>';
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         echo "<input id='".$rule['id']."' type='checkbox' name='alert-rule' data-orig_class='".$orig_class."' data-orig_colour='".$orig_col."' data-orig_state='".$orig_ico."' data-alert_id='".$rule['id']."' ".$alert_checked." data-size='small' data-content='".$popover_msg."' data-toggle='modal'>";
     }
 
     echo '</td>';
     echo '<td>';
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         echo "<div class='btn-group btn-group-sm' role='group'>";
         echo "<button type='button' class='btn btn-primary' data-toggle='modal' data-target='#create-alert' data-rule_id='".$rule['id']."' name='edit-alert-rule' data-content='".$popover_msg."' data-container='body'><i class='fa fa-lg fa-pencil' aria-hidden='true'></i></button> ";
         echo "<button type='button' class='btn btn-danger' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-alert_id='".$rule['id']."' name='delete-alert-rule' data-content='".$popover_msg."' data-container='body'><i class='fa fa-lg fa-trash' aria-hidden='true'></i></button>";
@@ -219,7 +219,7 @@ echo '</table>
     </div>';
 
 if ($count < 1) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         echo '<div class="row">
             <div class="col-sm-12">
             <form role="form" method="post">
diff --git a/html/includes/print-alert-templates.php b/html/includes/print-alert-templates.php
index ddfe065a1c..ea996ae5da 100644
--- a/html/includes/print-alert-templates.php
+++ b/html/includes/print-alert-templates.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -48,7 +48,7 @@ $(document).ready(function() {
         templates: {
         header: '<div id="{{ctx.id}}" class="{{css.header}}"> \
                     <div class="row"> \
-<?php if (Auth::user()->hasGlobalAdmin()) { ?>
+<?php if (LegacyAuth::user()->hasGlobalAdmin()) { ?>
                         <div class="col-sm-8 actionBar"> \
                             <span class="pull-left"> \
                             <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#alert-template" data-template_id="">Create new alert template</button> \
diff --git a/html/includes/print-alert-transports.php b/html/includes/print-alert-transports.php
index c9eedb2d7b..093db1eb63 100644
--- a/html/includes/print-alert-transports.php
+++ b/html/includes/print-alert-transports.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -29,7 +29,7 @@ require_once 'includes/modal/edit_transport_group.inc.php';
     </tr>
     <td colspan="6">
 <?php
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-alert-transport'><i class='fa fa-plus'></i> Create alert transport</button>";
 }
 
diff --git a/html/includes/print-graph-alerts.inc.php b/html/includes/print-graph-alerts.inc.php
index f9199e68b1..e0866d4178 100644
--- a/html/includes/print-graph-alerts.inc.php
+++ b/html/includes/print-graph-alerts.inc.php
@@ -17,7 +17,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = "Alert Stats";
 
@@ -29,12 +29,12 @@ if (isset($device['device_id']) && $device['device_id'] > 0) {
     );
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }
 
-if (!Auth::user()->hasGlobalRead()) {
-    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . Auth::id() . " GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
+if (!LegacyAuth::user()->hasGlobalRead()) {
+    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . LegacyAuth::id() . " GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }
 
 ?>
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 3bc43c3e52..ee092ea4df 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -5,7 +5,7 @@ $(function () {
 </script>
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Util\IP;
 
 // This file prints a table row for each interface
@@ -43,7 +43,7 @@ if (dbFetchCell('SELECT COUNT(*) FROM `mac_accounting` WHERE `port_id` = ?', arr
 echo "<tr style=\"background-color: $row_colour;\" valign=top onmouseover=\"this.style.backgroundColor='{$config['list_colour']['highlight']}';\" onmouseout=\"this.style.backgroundColor='$row_colour';\" style='cursor: pointer;'>
     <td valign=top width=350>";
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $port_data = array_to_htmljson($port);
     echo '<i class="fa fa-tag" data-toggle="popover" data-content="'.$port_data.'" data-html="true"></i>';
 }
diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php
index 5d63d6a217..c1d75cae71 100644
--- a/html/includes/print-map.inc.php
+++ b/html/includes/print-map.inc.php
@@ -13,7 +13,7 @@
  */
 
 //Don't know where this should come from, but it is used later, so I just define it here.
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $row_colour="#ffffff";
 
@@ -27,10 +27,10 @@ if (!empty($device['hostname'])) {
     $sql = ' ';
 }
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $join_sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `D1`.`device_id` = `DP`.`device_id`';
     $sql  .= ' AND `DP`.`user_id`=?';
-    $sql_array[] = Auth::id();
+    $sql_array[] = LegacyAuth::id();
 }
 
 $devices_by_id = array();
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index d602f56622..c288cd4273 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -1,7 +1,7 @@
 <?php
 // FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Device\WirelessSensor;
 use LibreNMS\ObjectCache;
 
@@ -652,8 +652,16 @@ if (empty($notifications['count']) && empty($notifications['sticky_count'])) {
 <?php
 
 if (Auth::check()) {
-    echo('
-           <li><a href="logout/"><i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> Logout</a></li>');
+    echo '<li><a href="';
+    echo route('logout');
+    echo '" onclick="event.preventDefault(); document.getElementById(\'logout-form\').submit();">';
+    echo ' <i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> ';
+    echo __('Logout');
+    echo '</a><form id="logout-form" action="';
+    echo route('logout');
+    echo '" method="POST" style="display: none;">';
+    echo csrf_field();
+    echo '</form></li>';
 }
 ?>
          </ul>
@@ -671,7 +679,7 @@ if (Auth::user()->hasGlobalAdmin()) {
           <li role="presentation" class="divider"></li>
 
 <?php if (Auth::user()->hasGlobalAdmin()) {
-    if (Auth::get()->canManageUsers()) {
+    if (LegacyAuth::get()->canManageUsers()) {
         echo('
            <li><a href="adduser/"><i class="fa fa-user-plus fa-fw fa-lg" aria-hidden="true"></i> Add User</a></li>
            <li><a href="deluser/"><i class="fa fa-user-times fa-fw fa-lg" aria-hidden="true"></i> Remove User</a></li>
diff --git a/html/includes/reports/alert-log.pdf.inc.php b/html/includes/reports/alert-log.pdf.inc.php
index 8aff6ba2d9..4e96dbae0a 100644
--- a/html/includes/reports/alert-log.pdf.inc.php
+++ b/html/includes/reports/alert-log.pdf.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pdf->AddPage('L');
 $where = '1';
@@ -15,11 +15,11 @@ if ($_GET['string']) {
     $param[] = '%'.$_GET['string'].'%';
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $query = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where ORDER BY `humandate` DESC";
 } else {
     $query   = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id RIGHT JOIN devices_perms AS P ON E.device_id = P.device_id WHERE $where AND P.user_id = ? ORDER BY `humandate` DESC";
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (isset($_GET['start']) && is_numeric($_GET['start'])) {
diff --git a/html/includes/table/address-search.inc.php b/html/includes/table/address-search.inc.php
index 1697468eee..1267192180 100644
--- a/html/includes/table/address-search.inc.php
+++ b/html/includes/table/address-search.inc.php
@@ -1,14 +1,14 @@
 <?php
 
 use LibreNMS\Util\IP;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $param = array();
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $perms_sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `D`.`device_id` = `DP`.`device_id`';
     $where     .= ' AND `DP`.`user_id`=?';
-    $param[]    = array(Auth::id());
+    $param[]    = array(LegacyAuth::id());
 }
 
 list($address,$prefix) = explode('/', $vars['address']);
diff --git a/html/includes/table/alert-schedule.inc.php b/html/includes/table/alert-schedule.inc.php
index 988ae71ab0..c8b1db6be5 100644
--- a/html/includes/table/alert-schedule.inc.php
+++ b/html/includes/table/alert-schedule.inc.php
@@ -12,13 +12,13 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = 1;
 
 $sql = " FROM `alert_schedule` AS S WHERE $where";
-if (!Auth::user()->hasGlobalRead()) {
-    $param[] = Auth::id();
+if (!LegacyAuth::user()->hasGlobalRead()) {
+    $param[] = LegacyAuth::id();
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php
index b8bca8cf27..8e0c4134e8 100644
--- a/html/includes/table/alertlog.inc.php
+++ b/html/includes/table/alertlog.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = 1;
 
@@ -27,11 +27,11 @@ if ($vars['state'] >= 0) {
     $param[] = mres($vars['state']);
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id WHERE $where";
 } else {
     $sql = " FROM `alert_log` AS E LEFT JOIN devices AS D ON E.device_id=D.device_id RIGHT JOIN alert_rules AS R ON E.rule_id=R.id RIGHT JOIN devices_perms AS P ON E.device_id = P.device_id WHERE $where AND P.user_id = ?";
-    $param[] = array(Auth::id());
+    $param[] = array(LegacyAuth::id());
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/includes/table/alerts.inc.php b/html/includes/table/alerts.inc.php
index 2730fa6735..53a13a5152 100644
--- a/html/includes/table/alerts.inc.php
+++ b/html/includes/table/alerts.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 require_once $config['install_dir'] . '/includes/device-groups.inc.php';
 
@@ -86,10 +86,10 @@ if (isset($searchPhrase) && !empty($searchPhrase)) {
 
 $sql = ' FROM `alerts` LEFT JOIN `devices` ON `alerts`.`device_id`=`devices`.`device_id`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`';
     $where .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= "  RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE $where";
diff --git a/html/includes/table/arp-search.inc.php b/html/includes/table/arp-search.inc.php
index 174be96d83..a2386da04e 100644
--- a/html/includes/table/arp-search.inc.php
+++ b/html/includes/table/arp-search.inc.php
@@ -1,15 +1,15 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $param = array();
 
 $sql .= ' FROM `ipv4_mac` AS M, `ports` AS P, `devices` AS D ';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `D`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE M.port_id = P.port_id AND P.device_id = D.device_id $where ";
diff --git a/html/includes/table/bills.inc.php b/html/includes/table/bills.inc.php
index 3a3f1f350f..be9659a113 100644
--- a/html/includes/table/bills.inc.php
+++ b/html/includes/table/bills.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 // Calculate filters
 $prev = !empty($vars['period']) && ($vars['period'] == 'prev');
@@ -48,10 +48,10 @@ if ($prev) {
 }
 
 // Permissions check
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $query  .= ' INNER JOIN `bill_perms` AS `BP` ON `bills`.`bill_id` = `BP`.`bill_id` ';
     $wheres[] = '`BP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (sizeof($wheres) > 0) {
@@ -147,7 +147,7 @@ foreach (dbFetchRows($sql, $param) as $bill) {
     $bar        = print_percentage_bar(250, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']);
     $actions    = "";
 
-    if (!$prev && Auth::user()->hasGlobalAdmin()) {
+    if (!$prev && LegacyAuth::user()->hasGlobalAdmin()) {
         $actions .= "<a href='" . generate_url(array('page' => 'bill', 'bill_id' => $bill['bill_id'], 'view' => 'edit')) .
             "'><i class='fa fa-pencil fa-lg icon-theme' title='Edit' aria-hidden='true'></i> Edit</a> ";
     }
diff --git a/html/includes/table/devices.inc.php b/html/includes/table/devices.inc.php
index 551a04cf5c..c97088020a 100644
--- a/html/includes/table/devices.inc.php
+++ b/html/includes/table/devices.inc.php
@@ -13,17 +13,17 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = 1;
 $param = array();
 
 $sql = ' FROM `devices`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`';
     $where .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (!empty($vars['location'])) {
@@ -172,7 +172,7 @@ foreach (dbFetchRows($sql, $param) as $device) {
                 <div class="col-xs-1"><a href="' . generate_device_url($device, array('tab' => 'alerts')) . '"> <i class="fa fa-exclamation-circle fa-lg icon-theme" title="View alerts"></i></a></div>
     ';
 
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $actions .= '<div class="col-xs-1"><a href="' . generate_device_url($device, array('tab' => 'edit')) . '"> <i class="fa fa-pencil fa-lg icon-theme" title="Edit device"></i></a></div>';
     }
 
@@ -186,7 +186,7 @@ foreach (dbFetchRows($sql, $param) as $device) {
                     ';
     if (isset($config['gateone']['server'])) {
         if ($config['gateone']['use_librenms_user'] == true) {
-                    $actions .= '<div class="col-xs-1"><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . Auth::user()->username . '@' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" title="SSH to ' . $device['hostname'] . '"></i></a></div>';
+                    $actions .= '<div class="col-xs-1"><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . LegacyAuth::user()->username . '@' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" title="SSH to ' . $device['hostname'] . '"></i></a></div>';
         } else {
                     $actions .= '<div class="col-xs-1"><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" title="SSH to ' . $device['hostname'] . '"></i></a></div>';
         }
diff --git a/html/includes/table/eventlog.inc.php b/html/includes/table/eventlog.inc.php
index af35bf7b50..66a600d05f 100644
--- a/html/includes/table/eventlog.inc.php
+++ b/html/includes/table/eventlog.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = '1';
 
@@ -32,11 +32,11 @@ if ($vars['string']) {
     $param[] = '%' . $vars['string'] . '%';
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = " FROM `eventlog` AS E LEFT JOIN `devices` AS `D` ON `E`.`host`=`D`.`device_id` WHERE $where";
 } else {
     $sql = " FROM `eventlog` AS E, devices_perms AS P WHERE $where AND E.host = P.device_id AND P.user_id = ?";
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/includes/table/fdb-search.inc.php b/html/includes/table/fdb-search.inc.php
index c8187b8d6e..23a3c70d21 100644
--- a/html/includes/table/fdb-search.inc.php
+++ b/html/includes/table/fdb-search.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $param = array();
 
@@ -17,10 +17,10 @@ $sql .= " LEFT JOIN ( SELECT `port_id`, COUNT(*) `portCount` FROM `ports_fdb` GR
 
 $where = " WHERE 1";
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` USING (`device_id`)';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (is_numeric($vars['device_id'])) {
@@ -80,7 +80,7 @@ $sql .= " GROUP BY `device_id`, `port_id`, `mac_address`, `vlan`, `hostname`, `i
 $sql .= " `ifAdminStatus`, `ifDescr`, `ifOperStatus`, `ifInErrors`, `ifOutErrors`";
 
 // Get most likely endpoint port_id, used to add a visual marker for this element
-// in the list 
+// in the list
 if (isset($vars['searchby']) && !empty($vars['searchPhrase']) && $vars['searchby'] != 'vlan') {
     $countsql .= " ORDER BY `C`.`portCount` ASC LIMIT 1";
     foreach (dbFetchRows($select . $sql . $countsql, $param) as $entry) {
diff --git a/html/includes/table/inventory.inc.php b/html/includes/table/inventory.inc.php
index c0ab3dd4df..8d8f432438 100644
--- a/html/includes/table/inventory.inc.php
+++ b/html/includes/table/inventory.inc.php
@@ -1,17 +1,17 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = '1';
 $param = array();
 
 
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = " FROM entPhysical AS E, devices AS D WHERE $where AND D.device_id = E.device_id";
 } else {
     $sql     = " FROM entPhysical AS E, devices AS D, devices_perms AS P WHERE $where AND D.device_id = E.device_id AND P.device_id = D.device_id AND P.user_id = ?";
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/includes/table/mempool.inc.php b/html/includes/table/mempool.inc.php
index d8105bb4ca..c40acba4f3 100644
--- a/html/includes/table/mempool.inc.php
+++ b/html/includes/table/mempool.inc.php
@@ -15,15 +15,15 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $graph_type = 'mempool_usage';
 $where      = 1;
 $sql        = ' FROM `mempools` AS `M` LEFT JOIN `devices` AS `D` ON `M`.`device_id` = `D`.`device_id`';
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `M`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE $where";
diff --git a/html/includes/table/poll-log.inc.php b/html/includes/table/poll-log.inc.php
index 784f5838d4..7113d004b6 100644
--- a/html/includes/table/poll-log.inc.php
+++ b/html/includes/table/poll-log.inc.php
@@ -1,18 +1,18 @@
 <?php
 
 use LibreNMS\Config;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $sql = ' FROM `devices` AS D ';
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $sql .= ", devices_perms AS P ";
 }
 
 $sql .= " LEFT JOIN `poller_groups` ON `D`.`poller_group`=`poller_groups`.`id`";
 
-if (!Auth::user()->hasGlobalAdmin()) {
-    $sql .= " WHERE D.device_id = P.device_id AND P.user_id = '".Auth::id()."' AND D.ignore = '0'";
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
+    $sql .= " WHERE D.device_id = P.device_id AND P.user_id = '".LegacyAuth::id()."' AND D.ignore = '0'";
 } else {
     $sql .= ' WHERE 1';
 }
@@ -70,4 +70,4 @@ $output = array(
     'rows'     => $response,
     'total'    => $total,
 );
-echo _json_encode($output);
+echo json_encode($output);
diff --git a/html/includes/table/ports.inc.php b/html/includes/table/ports.inc.php
index d44871015d..f79572e72a 100644
--- a/html/includes/table/ports.inc.php
+++ b/html/includes/table/ports.inc.php
@@ -23,19 +23,19 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = "`D`.`hostname` != '' ";
 $param = array();
 $sql = 'FROM `ports`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `ports`.`device_id` = `DP`.`device_id`';
     $sql .= ' LEFT JOIN `ports_perms` AS `PP` ON `ports`.`port_id` = `PP`.`port_id`';
 
     $where .= ' AND (`DP`.`user_id`=? OR `PP`.`user_id`=?)';
-    $param[] = Auth::id();
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= ' LEFT JOIN `devices` AS `D` ON `ports`.`device_id` = `D`.`device_id`';
@@ -167,7 +167,7 @@ foreach (dbFetchRows($query, $param) as $port) {
         $actions .= generate_device_url($device, array('tab' => 'alerts'));
         $actions .= '" title="View alerts"><i class="fa fa-exclamation-circle fa-lg icon-theme" aria-hidden="true"></i></a></div>';
 
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             $actions .= '<div class="col-xs-1"><a href="';
             $actions .= generate_device_url($device, array('tab' => 'edit', 'section' => 'ports'));
             $actions .= '" title="Edit ports"><i class="fa fa-pencil fa-lg icon-theme" aria-hidden="true"></i></a></div>';
diff --git a/html/includes/table/processor.inc.php b/html/includes/table/processor.inc.php
index f2e9a75357..518dd7f4da 100644
--- a/html/includes/table/processor.inc.php
+++ b/html/includes/table/processor.inc.php
@@ -15,15 +15,15 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $graph_type = 'processor_usage';
 $where      = 1;
 $sql        = ' FROM `processors` AS `P` LEFT JOIN `devices` AS `D` ON `P`.`device_id` = `D`.`device_id`';
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `P`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE $where";
diff --git a/html/includes/table/sensors-common.php b/html/includes/table/sensors-common.php
index a2eec87d66..354c8b33f0 100644
--- a/html/includes/table/sensors-common.php
+++ b/html/includes/table/sensors-common.php
@@ -15,7 +15,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $graph_type = mres($vars['graph_type']);
 $unit       = mres($vars['unit']);
@@ -23,16 +23,16 @@ $class      = mres($vars['class']);
 
 $sql = " FROM `$table` AS S, `devices` AS D";
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql .= ', devices_perms as P';
 }
 
 $sql .= " WHERE S.sensor_class=? AND S.device_id = D.device_id ";
 $param[] = mres($vars['class']);
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql .= " AND D.device_id = P.device_id AND P.user_id = ?";
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
diff --git a/html/includes/table/storage.inc.php b/html/includes/table/storage.inc.php
index 6ea29dc289..836710d393 100644
--- a/html/includes/table/storage.inc.php
+++ b/html/includes/table/storage.inc.php
@@ -15,7 +15,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $graph_type = 'storage_usage';
 
@@ -23,10 +23,10 @@ $where = 1;
 
 $sql = ' FROM `storage` AS `S` LEFT JOIN `devices` AS `D` ON `S`.`device_id` = `D`.`device_id`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `S`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE $where";
diff --git a/html/includes/table/syslog.inc.php b/html/includes/table/syslog.inc.php
index d09c09fada..4c24a4ff53 100644
--- a/html/includes/table/syslog.inc.php
+++ b/html/includes/table/syslog.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $where = '1';
 $param = array();
@@ -47,14 +47,14 @@ if (!empty($vars['to'])) {
     $param[] = $vars['to'];
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql  = 'FROM syslog AS S';
     $sql .= ' WHERE '.$where;
 } else {
     $sql   = 'FROM syslog AS S, devices_perms AS P ';
     $sql  .= 'WHERE S.device_id = P.device_id AND P.user_id = ? AND ';
     $sql  .= $where;
-    $param = array_merge(array(Auth::id()), $param);
+    $param = array_merge(array(LegacyAuth::id()), $param);
 }
 
 $count_sql = "SELECT COUNT(*) $sql";
diff --git a/html/includes/table/toner.inc.php b/html/includes/table/toner.inc.php
index a5baf79e22..db5dd582af 100644
--- a/html/includes/table/toner.inc.php
+++ b/html/includes/table/toner.inc.php
@@ -15,7 +15,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $graph_type = 'toner_usage';
 
@@ -26,7 +26,7 @@ if (!empty($searchPhrase)) {
 }
 
 $count_sql = "SELECT COUNT(`toner_id`) FROM `toner`";
-$param[] = Auth::id();
+$param[] = LegacyAuth::id();
 
 $count     = dbFetchCell($count_sql, $param);
 if (empty($count)) {
diff --git a/html/install.php b/html/install.php
index 344db70b7e..7b94a0a3c6 100644
--- a/html/install.php
+++ b/html/install.php
@@ -1,5 +1,5 @@
 <?php
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 session_start();
 if (empty($_POST) && !empty($_SESSION) && !isset($_REQUEST['stage'])) {
@@ -468,9 +468,9 @@ if (!file_exists("../config.php")) {
       </div>
       <div class="col-md-6">
 <?php
-if (Auth::get()->canManageUsers()) {
-    if (!Auth::get()->userExists($add_user)) {
-        if (Auth::get()->addUser($add_user, $add_pass, '10', $add_email)) {
+if (LegacyAuth::get()->canManageUsers()) {
+    if (!LegacyAuth::get()->userExists($add_user)) {
+        if (LegacyAuth::get()->addUser($add_user, $add_pass, '10', $add_email)) {
             echo("<div class='alert alert-success'>User has been added successfully</div>");
             $proceed = 0;
         } else {
diff --git a/html/legacy_index.php b/html/legacy_index.php
index 37bfdb9050..e7b706cbd0 100644
--- a/html/legacy_index.php
+++ b/html/legacy_index.php
@@ -11,7 +11,6 @@
  *
  */
 
-use LibreNMS\Authentication\Auth;
 use LibreNMS\Config;
 
 if (empty($_SERVER['PATH_INFO'])) {
@@ -188,33 +187,13 @@ if (isset($devel) || isset($vars['devel'])) {
     echo("</pre>");
 }
 
-if (Auth::check()) {
-    // Authenticated. Print a page.
-    if (isset($vars['page']) && !strstr("..", $vars['page']) &&  is_file("pages/" . $vars['page'] . ".inc.php")) {
-        require "pages/" . $vars['page'] . ".inc.php";
-    } else {
-        if (isset($config['front_page']) && is_file($config['front_page'])) {
-            require $config['front_page'];
-        } else {
-            require 'pages/front/default.php';
-        }
-    }
+if (isset($vars['page']) && !strstr("..", $vars['page']) &&  is_file("pages/" . $vars['page'] . ".inc.php")) {
+    require "pages/" . $vars['page'] . ".inc.php";
 } else {
-    // Not Authenticated. Show status page if enabled
-    if ($config['public_status'] === true) {
-        if (isset($vars['page']) && strstr("login", $vars['page'])) {
-            require 'pages/logon.inc.php';
-        } else {
-            echo '<div id="public-status">';
-            require 'pages/public.inc.php';
-            echo '</div>';
-            echo '<div id="public-logon" style="display:none;">';
-            echo '<div class="well"><h3>Logon<button class="btn btn-default" type="submit" style="float:right;" id="ToggleStatus">Status</button></h3></div>';
-            require 'pages/logon.inc.php';
-            echo '</div>';
-        }
+    if (isset($config['front_page']) && is_file($config['front_page'])) {
+        require $config['front_page'];
     } else {
-        require 'pages/logon.inc.php';
+        require 'pages/front/default.php';
     }
 }
 ?>
@@ -277,31 +256,6 @@ echo('<h5>Powered by <a href="' . $config['project_home'] . '" target="_blank" r
 <?php
 }
 
-// Pre-flight checks
-$rrd_dir = Config::get('rrd_dir');
-if (!is_dir($rrd_dir)) {
-    $msg_box[] = ['type' => 'error', 'message' => "RRD Log Directory is missing ($rrd_dir).  Graphing may fail."];
-}
-
-$temp_dir = Config::get('temp_dir');
-if (!is_dir($temp_dir)) {
-    $msg_box[] = ['type' => 'error', 'message' => "Temp Directory is missing ($temp_dir).  Graphing may fail."];
-} elseif (!is_writable($temp_dir)) {
-    $msg_box[] = ['type' => 'error', 'message' => "Temp Directory is not writable ($temp_dir).  Graphing may fail."];
-}
-
-if (dbFetchCell("SELECT COUNT(*) FROM `devices` WHERE `last_polled` <= DATE_ADD(NOW(), INTERVAL - 15 minute) AND `ignore` = 0 AND `disabled` = 0 AND status = 1", array()) > 0) {
-    $msg_box[] = ['type' => 'warning', 'message' => "<a href=\"poll-log/filter=unpolled/\">It appears as though you have some devices that haven't completed polling within the last 15 minutes, you may want to check that out :)</a>",'title' => 'Devices unpolled'];
-}
-
-foreach (dbFetchRows('SELECT `notifications`.* FROM `notifications` WHERE NOT exists( SELECT 1 FROM `notifications_attribs` WHERE `notifications`.`notifications_id` = `notifications_attribs`.`notifications_id` AND `notifications_attribs`.`user_id` = ?) AND `severity` > 1', array(Auth::id())) as $notification) {
-    $msg_box[] = [
-        'type' => 'error',
-        'message' => "<a href='notifications/'>${notification['body']}</a>",
-        'title' => $notification['title']
-    ];
-}
-
 if (is_array($msg_box)) {
     echo "<script>
         toastr.options.timeout = 10;
@@ -312,8 +266,6 @@ if (is_array($msg_box)) {
     foreach ($msg_box as $message) {
         Toastr::add($message['type'], $message['message'], $message['title']);
     }
-
-    echo Toastr::render();
 }
 
 if ($no_refresh !== true && $config['page_refresh'] != 0) {
@@ -381,6 +333,8 @@ if ($no_refresh !== true && $config['page_refresh'] != 0) {
 </script>');
 }
 
+echo Toastr::render();
+
 ?>
 </body>
 </html>
diff --git a/html/netcmd.php b/html/netcmd.php
index e699150eec..3416e03326 100644
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -10,7 +10,7 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 ini_set('allow_url_fopen', 0);
 
@@ -19,7 +19,7 @@ require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_GET['debug']);
 
-if (!Auth::check()) {
+if (!LegacyAuth::check()) {
     echo 'unauthenticated';
     exit;
 }
@@ -42,7 +42,7 @@ if ($_GET['query'] && $_GET['cmd']) {
                 break;
 
             case 'nmap':
-                if (!Auth::user()->isAdmin()) {
+                if (!LegacyAuth::user()->isAdmin()) {
                     echo 'insufficient privileges';
                 } else {
                     $cmd = $config['nmap']." $host";
diff --git a/html/network-map.php b/html/network-map.php
index ee9876dccb..cce22baf12 100644
--- a/html/network-map.php
+++ b/html/network-map.php
@@ -11,7 +11,7 @@
  *
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $links = 1;
 
@@ -52,7 +52,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) {
             graph [bgcolor=transparent];
 ';
 
-    if (!Auth::check()) {
+    if (!LegacyAuth::check()) {
         $map .= "\"Not authenticated\" [fontsize=20 fillcolor=\"lightblue\", URL=\"/\" shape=box3d]\n";
     } else {
         $loc_count = 1;
@@ -222,7 +222,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) {
     }
     echo $img;
 } else {
-    if (Auth::check()) {
+    if (LegacyAuth::check()) {
         // FIXME level 10 only?
         echo '<center>
                   <object width=1200 height=1000 data="'. $config['base_url'] . '/map.php?format=svg" type="image/svg+xml"></object>
diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php
index 684e9cf116..3a0159165b 100644
--- a/html/pages/about.inc.php
+++ b/html/pages/about.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = 'About';
 $git_log = `git log -10`;
@@ -90,7 +90,7 @@ echo "
     <table class='table table-condensed'>
       <tr>";
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo "        <td colspan='4'><span class='bg-danger'>$callback</span><br />
           Online stats: <a href='https://stats.librenms.org/'>stats.librenms.org</a></td>
         <tr>
@@ -220,9 +220,9 @@ echo "
         event.preventDefault();
         $.ajax({
             type: 'POST',
-            url: 'ajax_form.php',
+            url: 'ajax/form',
             data: { type: "callback-statistics", state: state},
-            dataType: "html",
+            dataType: "json",
             success: function(data){
              },
              error:function(){
@@ -234,9 +234,9 @@ echo "
         event.preventDefault();
         $.ajax({
             type: 'POST',
-            url: 'ajax_form.php',
+            url: 'ajax/form',
             data: { type: "callback-clear"},
-            dataType: "html",
+            dataType: "json",
             success: function(data){
                 location.reload(true);
              },
diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index c80ea4caca..395ea8cff0 100644
--- a/html/pages/addhost.inc.php
+++ b/html/pages/addhost.inc.php
@@ -1,12 +1,12 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Exceptions\HostUnreachableException;
 use LibreNMS\Util\IP;
 
 $no_refresh = true;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     include 'includes/error-no-perm.inc.php';
 
     exit;
@@ -26,7 +26,7 @@ if (!empty($_POST['hostname'])) {
         print_error("Invalid hostname or IP: $hostname");
     }
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         // Settings common to SNMPv2 & v3
         if ($_POST['port']) {
             $port = clean($_POST['port']);
diff --git a/html/pages/addsrv.inc.php b/html/pages/addsrv.inc.php
index ff59db9ec8..81239629f1 100644
--- a/html/pages/addsrv.inc.php
+++ b/html/pages/addsrv.inc.php
@@ -1,14 +1,14 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     include 'includes/error-no-perm.inc.php';
 } else {
     if ($vars['addsrv']) {
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             $updated = '1';
 
             $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
diff --git a/html/pages/adduser.inc.php b/html/pages/adduser.inc.php
index 56d2780c13..03d84c93de 100644
--- a/html/pages/adduser.inc.php
+++ b/html/pages/adduser.inc.php
@@ -1,12 +1,12 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     include 'includes/error-no-perm.inc.php';
-} elseif (Auth::user()->isDemoUser()) {
+} elseif (LegacyAuth::user()->isDemoUser()) {
     demo_account();
 } else {
     echo '<h3>Add User</h3>';
@@ -14,10 +14,10 @@ if (!Auth::user()->hasGlobalAdmin()) {
 
     $pagetitle[] = 'Add user';
 
-    if (Auth::get()->canManageUsers()) {
+    if (LegacyAuth::get()->canManageUsers()) {
         if ($_POST['action'] == 'add') {
             if ($_POST['new_username']) {
-                if (!Auth::get()->userExists($_POST['new_username'])) {
+                if (!LegacyAuth::get()->userExists($_POST['new_username'])) {
                     if (isset($_POST['can_modify_passwd'])) {
                         $_POST['can_modify_passwd'] = 1;
                     } else {
@@ -25,7 +25,7 @@ if (!Auth::user()->hasGlobalAdmin()) {
                     }
 
                     // FIXME: missing email field here on the form
-                    if (Auth::get()->addUser($_POST['new_username'], $_POST['new_password'], $_POST['new_level'], $_POST['new_email'], $_POST['new_realname'], $_POST['can_modify_passwd'])) {
+                    if (LegacyAuth::get()->addUser($_POST['new_username'], $_POST['new_password'], $_POST['new_level'], $_POST['new_email'], $_POST['new_realname'], $_POST['can_modify_passwd'])) {
                         echo '<span class=info>User '.$_POST['new_username'].' added!</span>';
                     }
                 } else {
diff --git a/html/pages/alert-schedule.inc.php b/html/pages/alert-schedule.inc.php
index 2e99d33743..73163a723c 100644
--- a/html/pages/alert-schedule.inc.php
+++ b/html/pages/alert-schedule.inc.php
@@ -12,11 +12,11 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = 'Alert Schedule';
 $no_refresh  = true;
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     include_once 'includes/modal/alert_schedule.inc.php';
     include_once 'includes/modal/remove_alert_schedule.inc.php';
 
diff --git a/html/pages/api-access.inc.php b/html/pages/api-access.inc.php
index f4d873b23e..197ce62aec 100644
--- a/html/pages/api-access.inc.php
+++ b/html/pages/api-access.inc.php
@@ -12,9 +12,9 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     if (empty($_POST['token'])) {
         $_POST['token'] = bin2hex(openssl_random_pseudo_bytes(16));
     }
@@ -56,7 +56,7 @@ if (Auth::user()->hasGlobalAdmin()) {
               <div class="col-sm-4">
                 <select class="form-control" id="user_id" name="user_id">
 <?php
-foreach ($userlist = Auth::get()->getUserlist() as $users) {
+foreach ($userlist = LegacyAuth::get()->getUserlist() as $users) {
     echo '<option value="'.$users['user_id'].'">'.$users['username'].'</option>';
 }
 
diff --git a/html/pages/authlog.inc.php b/html/pages/authlog.inc.php
index 9f8b6c34a2..8de0c1abde 100644
--- a/html/pages/authlog.inc.php
+++ b/html/pages/authlog.inc.php
@@ -1,9 +1,9 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 echo "<h3>Authlog</h3>";
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo '<table id="authlogtable" class="table table-hover table-condensed">';
     echo "<thead><th data-column-id='timestamp'>Timestamp</th><th data-column-id='user'>User</th><th data-column-id='ip'>IP Address</th><th data-column-id='authres'>Result</th></thead><tbody>";
     foreach (dbFetchRows("SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250") as $entry) {
diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php
index 16d4ed40b9..536357fc39 100644
--- a/html/pages/bill.inc.php
+++ b/html/pages/bill.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $bill_id = mres($vars['bill_id']);
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     include 'pages/bill/actions.inc.php';
 }
 
@@ -100,7 +100,7 @@ if (bill_permitted($bill_id)) {
         'transfer' => 'Transfer Graphs',
         'history' => 'Historical Graphs'
     );
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     $menu_options['edit'] = 'Edit';
     $menu_options['delete'] = 'Delete';
     $menu_options['reset'] = 'Reset';
@@ -124,11 +124,11 @@ foreach ($menu_options as $option => $text) {
 
     print_optionbar_end();
 
-if ($vars['view'] == 'edit' && Auth::user()->hasGlobalAdmin()) {
+if ($vars['view'] == 'edit' && LegacyAuth::user()->hasGlobalAdmin()) {
     include 'pages/bill/edit.inc.php';
-} elseif ($vars['view'] == 'delete' && Auth::user()->hasGlobalAdmin()) {
+} elseif ($vars['view'] == 'delete' && LegacyAuth::user()->hasGlobalAdmin()) {
     include 'pages/bill/delete.inc.php';
-} elseif ($vars['view'] == 'reset' && Auth::user()->hasGlobalAdmin()) {
+} elseif ($vars['view'] == 'reset' && LegacyAuth::user()->hasGlobalAdmin()) {
     include 'pages/bill/reset.inc.php';
 } elseif ($vars['view'] == 'history') {
     include 'pages/bill/history.inc.php';
diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index 6fe99c6b58..d3d902976a 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -1,11 +1,11 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
 if ($_POST['addbill'] == 'yes') {
-    if (!Auth::user()->hasGlobalAdmin()) {
+    if (!LegacyAuth::user()->hasGlobalAdmin()) {
         include 'includes/error-no-perm.inc.php';
         exit;
     }
@@ -116,7 +116,7 @@ include 'includes/modal/new_bill.inc.php';
     <div id="{{ctx.id}}" class="{{css.header}}">
         <div class="row">
             <div class="col-sm-4">
-            <?php if (Auth::user()->hasGlobalAdmin()) {  ?>
+            <?php if (LegacyAuth::user()->hasGlobalAdmin()) {  ?>
                 <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#create-bill"><i class="fa fa-plus"></i> Create Bill</button>
             <?php } ?>
             </div>
diff --git a/html/pages/delhost.inc.php b/html/pages/delhost.inc.php
index 3625e5a736..535dbe115d 100644
--- a/html/pages/delhost.inc.php
+++ b/html/pages/delhost.inc.php
@@ -1,15 +1,15 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     require 'includes/error-no-perm.inc.php';
     exit;
 }
 
 $pagetitle[] = "Delete device";
 
-if (Auth::user()->isDemoUser()) {
+if (LegacyAuth::user()->isDemoUser()) {
     demo_account();
 } else {
     if (is_numeric($_REQUEST['id'])) {
diff --git a/html/pages/deluser.inc.php b/html/pages/deluser.inc.php
index c0baf9ce87..805ab66ad0 100644
--- a/html/pages/deluser.inc.php
+++ b/html/pages/deluser.inc.php
@@ -1,34 +1,34 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 echo '<div style="margin: 10px;">';
 
-if (!Auth::user()->isAdmin()) {
+if (!LegacyAuth::user()->isAdmin()) {
     include 'includes/error-no-perm.inc.php';
 } else {
     echo '<h3>Delete User</h3>';
 
     $pagetitle[] = 'Delete user';
 
-    if (Auth::get()->canManageUsers()) {
+    if (LegacyAuth::get()->canManageUsers()) {
         if ($vars['action'] == 'del') {
             $id = (int)$vars['id'];
-            $delete_username = dbFetchCell('SELECT username FROM users WHERE user_id = ?', [$id]);
+            $user = LegacyAuth::get()->getUser($id);
 
             if ($vars['confirm'] == 'yes') {
-                if (Auth::get()->deleteUser($id) >= 0) {
-                    print_message('<div class="infobox">User "'.$delete_username.'" deleted!');
+                if (LegacyAuth::get()->deleteUser($id) >= 0) {
+                    print_message('<div class="infobox">User "'.$user['username'].'" deleted!');
                 } else {
-                    print_error('Error deleting user "'.$delete_username.'"!');
+                    print_error('Error deleting user "'.$user['username'].'"!');
                 }
             } else {
-                print_error('You have requested deletion of the user "'.$delete_username.'". This action can not be reversed.<br /><a class="btn btn-danger" href="deluser/action=del/id='.$id.'/confirm=yes">Click to confirm</a>');
+                print_error('You have requested deletion of the user "'.$user['username'].'". This action can not be reversed.<br /><a class="btn btn-danger" href="deluser/action=del/id='.$id.'/confirm=yes">Click to confirm</a>');
             }
         }
 
         // FIXME v mysql query should be replaced by authmodule
-        $userlist = dbFetchRows('SELECT * FROM `users`');
+        $userlist = LegacyAuth::get()->getUserlist();
 
         echo '
             <form role="form" class="form-horizontal" method="GET" action="">
diff --git a/html/pages/device-dependencies.inc.php b/html/pages/device-dependencies.inc.php
index c5798dd493..fffa65cd01 100644
--- a/html/pages/device-dependencies.inc.php
+++ b/html/pages/device-dependencies.inc.php
@@ -12,7 +12,7 @@
  */
 
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -59,7 +59,7 @@ var grid = $("#hostdeps").bootgrid({
     templates: {
         header: '<div id="{{ctx.id}}" class="{{css.header}}"> \
                     <div class="row"> \
-<?php if (Auth::user()->hasGlobalAdmin()) { ?>
+<?php if (LegacyAuth::user()->hasGlobalAdmin()) { ?>
                         <div class="col-sm-8 actionBar"> \
                             <span class="pull-left"> \
                             <button type="button" class="btn btn-primary btn-sm command-manage" data-toggle="modal" data-target="#manage-dependencies" data-template_id="">Manage Device Dependencies</button> \
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index d329b3e01a..155304ee91 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (!is_numeric($vars['device'])) {
     $vars['device'] = getidbyname($vars['device']);
@@ -354,7 +354,7 @@ if (device_permitted($vars['device']) || $permitted_by_port) {
             </a>
             </li>';
 
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             if (!is_array($config['rancid_configs'])) {
                 $config['rancid_configs'] = array($config['rancid_configs']);
             }
@@ -457,7 +457,7 @@ if (device_permitted($vars['device']) || $permitted_by_port) {
                     <li><a href="https://'.$device['hostname'].'" target="_blank" rel="noopener"><i class="fa fa-globe fa-lg icon-theme"  aria-hidden="true"></i> Web</a></li>';
         if (isset($config['gateone']['server'])) {
             if ($config['gateone']['use_librenms_user'] == true) {
-                    echo '<li><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . Auth::user()->username . '@' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" aria-hidden="true"></i> SSH</a></li>';
+                    echo '<li><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . LegacyAuth::user()->username . '@' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" aria-hidden="true"></i> SSH</a></li>';
             } else {
                     echo '<li><a href="' . $config['gateone']['server'] . '?ssh=ssh://' . $device['hostname'] . '&location=' . $device['hostname'] .'" target="_blank" rel="noopener"><i class="fa fa-lock fa-lg icon-theme" aria-hidden="true"></i> SSH</a></li>';
             }
@@ -467,7 +467,7 @@ if (device_permitted($vars['device']) || $permitted_by_port) {
         }
             echo '<li><a href="telnet://'.$device['hostname'].'" target="_blank" rel="noopener"><i class="fa fa-terminal fa-lg icon-theme"  aria-hidden="true"></i> Telnet</a></li>';
 
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             echo '<li>
                 <a href="'.generate_device_url($device, array('tab' => 'edit')).'">
                 <i class="fa fa-pencil fa-lg icon-theme"  aria-hidden="true"></i> Edit </a>
diff --git a/html/pages/device/capture.inc.php b/html/pages/device/capture.inc.php
index a2050ff070..4f9658b7fc 100644
--- a/html/pages/device/capture.inc.php
+++ b/html/pages/device/capture.inc.php
@@ -23,13 +23,13 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 $pagetitle[] = "Capture";
 
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     print_error("Insufficient Privileges");
 } else {
     ?>
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index 6583fc7f67..b4a11f8be5 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -8,7 +8,7 @@ $link_array = array('page'    => 'device',
     'device'  => $device['device_id'],
     'tab' => 'edit');
 
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     print_error("Insufficient Privileges");
 } else {
     $panes['device']   = 'Device Settings';
diff --git a/html/pages/device/edit/alerts.inc.php b/html/pages/device/edit/alerts.inc.php
index cd9f93db3f..0846adecaa 100644
--- a/html/pages/device/edit/alerts.inc.php
+++ b/html/pages/device/edit/alerts.inc.php
@@ -1,9 +1,9 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if ($_POST['editing']) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $override_sysContact_bool = mres($_POST['override_sysContact']);
         if (isset($_POST['sysContact'])) {
             $override_sysContact_string = mres($_POST['sysContact']);
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index dc3f079ca6..0dd84cc04f 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -1,10 +1,10 @@
 <?php
 
 use App\Models\Device;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if ($_POST['editing']) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $updated = 0;
 
         if (isset($_POST['parent_id'])) {
@@ -61,7 +61,7 @@ if ($_POST['editing']) {
             $update_message = "Device record update error.";
         }
         if (isset($_POST['hostname']) && $_POST['hostname'] !== '' && $_POST['hostname'] !== $device['hostname']) {
-            if (Auth::user()->hasGlobalAdmin()) {
+            if (LegacyAuth::user()->hasGlobalAdmin()) {
                 $result = renamehost($device['device_id'], $_POST['hostname'], 'webui');
                 if ($result == "") {
                     print_message("Hostname updated from {$device['hostname']} to {$_POST['hostname']}");
diff --git a/html/pages/device/edit/ipmi.inc.php b/html/pages/device/edit/ipmi.inc.php
index 4cc1f9ff15..49a225a128 100644
--- a/html/pages/device/edit/ipmi.inc.php
+++ b/html/pages/device/edit/ipmi.inc.php
@@ -1,9 +1,9 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if ($_POST['editing']) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $ipmi_hostname = mres($_POST['ipmi_hostname']);
         $ipmi_username = mres($_POST['ipmi_username']);
         $ipmi_password = mres($_POST['ipmi_password']);
diff --git a/html/pages/device/edit/services.inc.php b/html/pages/device/edit/services.inc.php
index 23db36ed93..0582bdfd07 100644
--- a/html/pages/device/edit/services.inc.php
+++ b/html/pages/device/edit/services.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     if ($vars['addsrv']) {
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             $updated = '1';
 
             $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php
index d44ac92939..d25a2cab8e 100644
--- a/html/pages/device/edit/snmp.inc.php
+++ b/html/pages/device/edit/snmp.inc.php
@@ -1,9 +1,9 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if ($_POST['editing']) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $poller_group = isset($_POST['poller_group']) ? clean($_POST['poller_group']) : 0;
         $snmp_enabled = ($_POST['snmp'] == 'on');
         if ($snmp_enabled) {
diff --git a/html/pages/device/notes.inc.php b/html/pages/device/notes.inc.php
index e7d0b53c19..54a0cdcd95 100644
--- a/html/pages/device/notes.inc.php
+++ b/html/pages/device/notes.inc.php
@@ -10,14 +10,14 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $data = dbFetchRow("SELECT `notes` FROM `devices` WHERE device_id = ?", array(
     $device['device_id']
 ));
 
 $disabled = '';
-if (!Auth::user()->hasGlobalAdmin()) {
+if (!LegacyAuth::user()->hasGlobalAdmin()) {
     $disabled = 'disabled';
 }
 
diff --git a/html/pages/device/performance.inc.php b/html/pages/device/performance.inc.php
index f562292176..46fa923d98 100644
--- a/html/pages/device/performance.inc.php
+++ b/html/pages/device/performance.inc.php
@@ -18,7 +18,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (!isset($vars['section'])) {
     $vars['section'] = "performance";
@@ -92,12 +92,12 @@ if (empty($vars['dtpickerto'])) {
 
 
     <?php
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $query = "SELECT DATE_FORMAT(timestamp, '" . $config['alert_graph_date_format'] . "') Date, xmt,rcv,loss,min,max,avg FROM `device_perf` WHERE `device_id` = ? AND `timestamp` >= ? AND `timestamp` <= ?";
         $param = array($device['device_id'], $vars['dtpickerfrom'], $vars['dtpickerto']);
     } else {
         $query = "SELECT DATE_FORMAT(timestamp, '" . $config['alert_graph_date_format'] . "') Date, xmt,rcv,loss,min,max,avg FROM `device_perf`,`devices_perms` WHERE `device_perf`.`device_id` = ? AND `device_perf`.`device_id` = devices_perms.device_id AND devices_perms.user_id = ? AND `timestamp` >= ? AND `timestamp` <= ?";
-        $param = array($device['device_id'], Auth::id(), $vars['dtpickerfrom'], $vars['dtpickerto']);
+        $param = array($device['device_id'], LegacyAuth::id(), $vars['dtpickerfrom'], $vars['dtpickerto']);
     }
     ?>
 
diff --git a/html/pages/device/port.inc.php b/html/pages/device/port.inc.php
index 3f41a5754d..139282ff75 100644
--- a/html/pages/device/port.inc.php
+++ b/html/pages/device/port.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if (!isset($vars['view'])) {
     $vars['view'] = 'graphs';
@@ -238,7 +238,7 @@ if (dbFetchCell("SELECT COUNT(*) FROM juniAtmVp WHERE port_id = '".$port['port_i
     }
 }//end if
 
-if (Auth::user()->hasGlobalAdmin() && $config['enable_billing'] == 1) {
+if (LegacyAuth::user()->hasGlobalAdmin() && $config['enable_billing'] == 1) {
     $bills = dbFetchRows("SELECT `bill_id` FROM `bill_ports` WHERE `port_id`=?", array($port['port_id']));
     if (count($bills) === 1) {
         echo "<span style='float: right;'><a href='" . generate_url(array('page' => 'bill','bill_id' => $bills[0]['bill_id'])) . "'><i class='fa fa-money fa-lg icon-theme' aria-hidden='true'></i> View Bill</a></span>";
diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php
index e57f127e87..d95b0a9201 100644
--- a/html/pages/device/services.inc.php
+++ b/html/pages/device/services.inc.php
@@ -15,7 +15,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = 'Services';
 
@@ -59,7 +59,7 @@ foreach ($menu_options as $option => $text) {
 }
 unset($sep);
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo '<div class="pull-right"><a data-toggle="modal" href="#create-service"><i class="fa fa-cog" style="color:green" aria-hidden="true"></i> Add Service</a></div>';
 }
 
@@ -90,7 +90,7 @@ if (count($services) > '0') {
         echo '<div class="col-sm-5">' . nl2br(trim($service['service_message'])) . '</div>';
         echo '<div class="col-sm-2">';
         echo '<div class="pull-right">';
-        if (Auth::user()->hasGlobalAdmin()) {
+        if (LegacyAuth::user()->hasGlobalAdmin()) {
             echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='{$service['service_id']}' name='edit-service'><i class='fa fa-pencil' aria-hidden='true'></i></button>
         <button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='{$service['service_id']}' name='delete-service'><i class='fa fa-trash' aria-hidden='true'></i></button";
         }
diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php
index f8b40ce4f2..6b50a2bcba 100644
--- a/html/pages/device/showconfig.inc.php
+++ b/html/pages/device/showconfig.inc.php
@@ -1,11 +1,11 @@
 <?php
 
 // FIXME svn stuff still using optc etc, won't work, needs updating!
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 use Symfony\Component\Process\Process;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     if (!is_array(Config::get('rancid_configs'))) {
         Config::set('rancid_configs', array(Config::get('rancid_configs')));
     }
@@ -154,7 +154,7 @@ if (Auth::user()->hasGlobalAdmin()) {
         $oxidized_hostname = $device['hostname'];
         // fetch info about the node and then a list of versions for that node
         $node_info = json_decode(file_get_contents(Config::get('oxidized')['url'].'/node/show/'.$oxidized_hostname.'?format=json'), true);
-        
+
         // Try other hostname format if Oxidized request failed
         if (! $node_info) {
             // Adjust hostname based on whether domain was already in it or not
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 146a55e4f4..e9fbbd2833 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = "Devices";
 
@@ -245,7 +245,7 @@ if ($format == "graph") {
     }
     echo '</div>';
 } else {
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $os = "SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`";
         $ver = "SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`";
         $platform = "SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`";
@@ -257,7 +257,7 @@ if ($format == "graph") {
         $platform = "SELECT `hardware` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `hardware` ORDER BY `hardware`";
         $features = "SELECT `features` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `features` ORDER BY `features`";
         $types = "SELECT `type` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `type` ORDER BY `type`";
-        $param[] = Auth::id();
+        $param[] = LegacyAuth::id();
     }
 
 
diff --git a/html/pages/edituser.inc.php b/html/pages/edituser.inc.php
index 7a952cda9e..2e6a0cfd68 100644
--- a/html/pages/edituser.inc.php
+++ b/html/pages/edituser.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -10,11 +10,11 @@ echo "<div style='margin: 10px;'>";
 
 $pagetitle[] = 'Edit user';
 
-if (!Auth::user()->isAdmin()) {
+if (!LegacyAuth::user()->isAdmin()) {
     include 'includes/error-no-perm.inc.php';
 } else {
     if ($vars['user_id'] && !$vars['edit']) {
-        $user_data = Auth::get()->getUser($vars['user_id']);
+        $user_data = LegacyAuth::get()->getUser($vars['user_id']);
         echo '<p><h2>'.$user_data['realname']."</h2><a href='edituser/'>Change...</a></p>";
         // Perform actions if requested
         if ($vars['action'] == 'deldevperm') {
@@ -243,7 +243,7 @@ if (!Auth::user()->isAdmin()) {
         </form>
         </div>";
     } elseif ($vars['user_id'] && $vars['edit']) {
-        if (Auth::user()->isDemoUser()) {
+        if (LegacyAuth::user()->isDemoUser()) {
             demo_account();
         } else {
             if (!empty($vars['new_level'])) {
@@ -251,10 +251,10 @@ if (!Auth::user()->isAdmin()) {
                     $vars['can_modify_passwd'] = '1';
                 }
 
-                Auth::get()->updateUser($vars['user_id'], $vars['new_realname'], $vars['new_level'], $vars['can_modify_passwd'], $vars['new_email']);
+                LegacyAuth::get()->updateUser($vars['user_id'], $vars['new_realname'], $vars['new_level'], $vars['can_modify_passwd'], $vars['new_email']);
                 print_message('User has been updated');
-                if (!empty($vars['new_pass1']) && $vars['new_pass1'] == $vars['new_pass2'] && Auth::get()->canUpdatePasswords($vars['cur_username'])) {
-                    if (Auth::get()->changePassword($vars['cur_username'], $vars['new_pass1']) == 1) {
+                if (!empty($vars['new_pass1']) && $vars['new_pass1'] == $vars['new_pass2'] && LegacyAuth::get()->canUpdatePasswords($vars['cur_username'])) {
+                    if (LegacyAuth::get()->changePassword($vars['cur_username'], $vars['new_pass1']) == 1) {
                         print_message("User password has been updated");
                     } else {
                         print_error("Password couldn't be updated");
@@ -264,7 +264,7 @@ if (!Auth::user()->isAdmin()) {
                 }
             }
 
-            $users_details = Auth::get()->getUser($vars['user_id']);
+            $users_details = LegacyAuth::get()->getUser($vars['user_id']);
             if (!empty($users_details)) {
                 if (!empty($vars['dashboard']) && $vars['dashboard'] != $users_details['dashboard']) {
                     set_user_pref('dashboard', $vars['dashboard']);
@@ -275,7 +275,7 @@ if (!Auth::user()->isAdmin()) {
   <input type='hidden' name='cur_username' value='" . $users_details['username'] . "'>
   <input type='hidden' name='edit' value='yes'>
 ";
-                if (Auth::get()->canUpdateUsers() == '1') {
+                if (LegacyAuth::get()->canUpdateUsers() == '1') {
                     if (empty($vars['new_realname'])) {
                         $vars['new_realname'] = $users_details['realname'];
                     }
@@ -337,7 +337,7 @@ if (!Auth::user()->isAdmin()) {
     </div>
   </div>";
 
-                    if (Auth::get()->canUpdatePasswords($users_details['username'])) {
+                    if (LegacyAuth::get()->canUpdatePasswords($users_details['username'])) {
                         echo "
         <div class='form-group'>
             <label for='new_pass1' class='col-sm-2 control-label'>Password</label>
@@ -432,7 +432,7 @@ if (!Auth::user()->isAdmin()) {
             }//end if !empty($users_details)
         }//end if
     } else {
-        $user_list = Auth::get()->getUserlist();
+        $user_list = LegacyAuth::get()->getUserlist();
 
         echo '<h3>Select a user to edit</h3>';
 
diff --git a/html/pages/eventlog.inc.php b/html/pages/eventlog.inc.php
index 860042aebe..d640be0105 100644
--- a/html/pages/eventlog.inc.php
+++ b/html/pages/eventlog.inc.php
@@ -13,12 +13,12 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 $param = array();
 
-if ($vars['action'] == 'expunge' && Auth::user()->hasGlobalAdmin()) {
+if ($vars['action'] == 'expunge' && LegacyAuth::user()->hasGlobalAdmin()) {
     dbQuery('TRUNCATE TABLE `eventlog`');
     print_message('Event log truncated');
 }
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index 376ba13a82..4fe4c92ebf 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 require_once 'includes/object-cache.inc.php';
 
@@ -34,10 +34,10 @@ echo '<div class="status-boxes">';
 $count_boxes = 0;
 
 // Device down boxes
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = "SELECT * FROM `devices` WHERE `status` = '0' AND `ignore` = '0' LIMIT " . $config['front_page_down_box_limit'];
 } else {
-    $sql = "SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . Auth::id() . "' AND D.status = '0' AND D.ignore = '0' LIMIT" . $config['front_page_down_box_limit'];
+    $sql = "SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . LegacyAuth::id() . "' AND D.status = '0' AND D.ignore = '0' LIMIT" . $config['front_page_down_box_limit'];
 }
 
 foreach (dbFetchRows($sql) as $device) {
@@ -50,10 +50,10 @@ foreach (dbFetchRows($sql) as $device) {
     ++$count_boxes;
 }
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0' AND `D`.`status` = '1' LIMIT " . $config['front_page_down_box_limit'];
 } else {
-    $sql = "SELECT * FROM `ports` AS I, `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . Auth::id() . "' AND  I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0' AND `D`.`status` = '1'  LIMIT " . $config['front_page_down_box_limit'];
+    $sql = "SELECT * FROM `ports` AS I, `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . LegacyAuth::id() . "' AND  I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0' AND `D`.`status` = '1'  LIMIT " . $config['front_page_down_box_limit'];
 }
 
 // These things need to become more generic, and more manageable across different frontpages... rewrite inc :>
@@ -78,12 +78,12 @@ if ($config['warn']['ifdown']) {
 /*
     FIXME service permissions? seem nonexisting now.. */
 // Service down boxes
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = "SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id AND service_status = '2' AND D.ignore = '0' AND S.service_ignore = '0' LIMIT " . $config['front_page_down_box_limit'];
     $param[] = '';
 } else {
     $sql = "SELECT * FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '2' LIMIT " . $config['front_page_down_box_limit'];
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 foreach (dbFetchRows($sql, $param) as $service) {
@@ -99,10 +99,10 @@ foreach (dbFetchRows($sql, $param) as $service) {
 
 // BGP neighbour down boxes
 if (isset($config['enable_bgp']) && $config['enable_bgp']) {
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerAdminStatus != 'start' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0 AND `D`.`status` = '1' LIMIT " . $config['front_page_down_box_limit'];
     } else {
-        $sql = "SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . Auth::id() . "' AND  bgpPeerAdminStatus != 'start' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0 AND `D`.`status` = '1' LIMIT " . $config['front_page_down_box_limit'];
+        $sql = "SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . LegacyAuth::id() . "' AND  bgpPeerAdminStatus != 'start' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0 AND `D`.`status` = '1' LIMIT " . $config['front_page_down_box_limit'];
     }
 
     foreach (dbFetchRows($sql) as $peer) {
@@ -119,10 +119,10 @@ if (isset($config['enable_bgp']) && $config['enable_bgp']) {
 
 // Device rebooted boxes
 if (filter_var($config['uptime_warning'], FILTER_VALIDATE_FLOAT) !== false && $config['uptime_warning'] > 0 && $config['os'][$device['os']]['bad_uptime'] !== true) {
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT * FROM `devices` AS D WHERE D.status = '1' AND D.uptime > 0 AND D.uptime < '" . $config['uptime_warning'] . "' AND D.ignore = 0 LIMIT " . $config['front_page_down_box_limit'];
     } else {
-        $sql = "SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . Auth::id() . "' AND D.status = '1' AND D.uptime > 0 AND D.uptime < '" . $config['uptime_warning'] . "' AND D.ignore = 0 LIMIT " . $config['front_page_down_box_limit'];
+        $sql = "SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . LegacyAuth::id() . "' AND D.status = '1' AND D.uptime > 0 AND D.uptime < '" . $config['uptime_warning'] . "' AND D.ignore = 0 LIMIT " . $config['front_page_down_box_limit'];
     }
 
     foreach (dbFetchRows($sql) as $device) {
@@ -198,12 +198,12 @@ if ($config['enable_syslog']) {
     echo '</div>';
     echo '</div>';
 } else {
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $query = "SELECT *,DATE_FORMAT(datetime, '" . $config['dateformat']['mysql']['compact'] . "') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,15";
         $alertquery = 'SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id LEFT JOIN alert_rules ON alert_log.rule_id=alert_rules.id ORDER BY `time_logged` DESC LIMIT 0,15';
     } else {
-        $query = "SELECT *,DATE_FORMAT(datetime, '" . $config['dateformat']['mysql']['compact'] . "') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host = P.device_id AND P.user_id = " . Auth::id() . ' ORDER BY `datetime` DESC LIMIT 0,15';
-        $alertquery = 'SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id LEFT JOIN alert_rules ON alert_log.rule_id=alert_rules.id RIGHT JOIN devices_perms ON alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = ' . Auth::id() . ' ORDER BY `time_logged` DESC LIMIT 0,15';
+        $query = "SELECT *,DATE_FORMAT(datetime, '" . $config['dateformat']['mysql']['compact'] . "') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host = P.device_id AND P.user_id = " . LegacyAuth::id() . ' ORDER BY `datetime` DESC LIMIT 0,15';
+        $alertquery = 'SELECT devices.device_id,name,state,time_logged FROM alert_log LEFT JOIN devices ON alert_log.device_id=devices.device_id LEFT JOIN alert_rules ON alert_log.rule_id=alert_rules.id RIGHT JOIN devices_perms ON alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = ' . LegacyAuth::id() . ' ORDER BY `time_logged` DESC LIMIT 0,15';
     }
 
     echo '<div class="container-fluid">
diff --git a/html/pages/front/example2.php b/html/pages/front/example2.php
index de0efe521d..1aaaf7776d 100644
--- a/html/pages/front/example2.php
+++ b/html/pages/front/example2.php
@@ -8,7 +8,7 @@
 ?>
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $nodes = array();
 
@@ -105,7 +105,7 @@ echo '</div>
     <td bgcolor=#e5e5e5 width=275 valign=top>';
 
 // this stuff can be customised to show whatever you want....
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql  = "SELECT * FROM ports AS I, devices AS D WHERE `ifAlias` like 'L2TP: %' AND I.device_id = D.device_id AND D.hostname LIKE '%";
     $sql .= $config['mydomain']."' ORDER BY I.ifAlias";
     unset($seperator);
diff --git a/html/pages/front/globe.php b/html/pages/front/globe.php
index 101ff5146e..f2ff468895 100644
--- a/html/pages/front/globe.php
+++ b/html/pages/front/globe.php
@@ -29,7 +29,7 @@
 
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 include_once 'includes/object-cache.inc.php';
 echo '<div class="container-fluid">
@@ -97,11 +97,11 @@ if ($config['enable_syslog']) {
     echo("</div>");
     echo("</div>");
 } else {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $query = "SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,15";
     } else {
         $query = "SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host =
-            P.device_id AND P.user_id = " . Auth::id() . " ORDER BY `datetime` DESC LIMIT 0,15";
+            P.device_id AND P.user_id = " . LegacyAuth::id() . " ORDER BY `datetime` DESC LIMIT 0,15";
     }
 
     echo('<div class="container-fluid">
diff --git a/html/pages/front/jt.php b/html/pages/front/jt.php
index 61adfdf795..643c82ad62 100644
--- a/html/pages/front/jt.php
+++ b/html/pages/front/jt.php
@@ -3,7 +3,7 @@
     <td bgcolor=#e5e5e5 valign=top>
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $nodes = array();
 
@@ -117,7 +117,7 @@ echo '</div>
     <td bgcolor=#e5e5e5 width=470 valign=top>';
 
 // this stuff can be customised to show whatever you want....
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = "SELECT * FROM ports AS I, devices AS D WHERE `ifAlias` like 'Transit: %' AND I.device_id = D.device_id ORDER BY I.ifAlias";
     unset($seperator);
     foreach (dbFetchRows($sql) as $interface) {
diff --git a/html/pages/front/map.php b/html/pages/front/map.php
index ce88edcfdc..418914a983 100644
--- a/html/pages/front/map.php
+++ b/html/pages/front/map.php
@@ -22,7 +22,7 @@
  * @subpackage Frontpage
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 if ($config['map']['engine'] == 'leaflet') {
     require_once 'includes/common/worldmap.inc.php';
@@ -186,11 +186,11 @@ if ($config['enable_syslog']) {
     echo("</div>");
     echo("</div>");
 } else {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $query = "SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,15";
     } else {
         $query = "SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `eventlog` AS E, devices_perms AS P WHERE E.host =
-    P.device_id AND P.user_id = " . Auth::id() . " ORDER BY `datetime` DESC LIMIT 0,15";
+    P.device_id AND P.user_id = " . LegacyAuth::id() . " ORDER BY `datetime` DESC LIMIT 0,15";
     }
 
     echo('<div class="container-fluid">
diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php
index 124b0e628b..337f4d2d56 100644
--- a/html/pages/front/tiles.php
+++ b/html/pages/front/tiles.php
@@ -16,7 +16,7 @@
  * Code for Gridster.sort_by_row_and_col_asc(serialization) call is from http://gridster.net/demos/grid-from-serialize.html
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh   = true;
 $default_dash = get_user_pref('dashboard', 0);
@@ -26,7 +26,7 @@ require_once 'includes/modal/alert_notes.inc.php';
 // get all dashboards this user can access and put them into two lists user_dashboards and shared_dashboards
 $dashboards = get_dashboards();
 list($user_dashboards, $shared_dashboards) = array_reduce($dashboards, function ($ret, $dash) {
-    if ($dash['user_id'] == Auth::id()) {
+    if ($dash['user_id'] == LegacyAuth::id()) {
         $ret[0][] = $dash;
     } else {
         $ret[1][] = $dash;
@@ -44,16 +44,16 @@ if (!isset($dashboards[$default_dash])) {
 if ($default_dash == 0 && empty($user_dashboards)) {
     $new_dash = array(
         'dashboard_name'=>'Default',
-        'user_id'=>Auth::id(),
+        'user_id'=>LegacyAuth::id(),
     );
 
     $dashboard_id = dbInsert($new_dash, 'dashboards');
     $new_dash['dashboard_id'] = $dashboard_id;
-    $new_dash['username'] = Auth::user()->username;
+    $new_dash['username'] = LegacyAuth::user()->username;
     $vars['dashboard'] = $new_dash;
 
-    if (dbFetchCell('select 1 from users_widgets where user_id = ? && dashboard_id = ?', array(Auth::id(),0)) == 1) {
-        dbUpdate(array('dashboard_id'=>$dashboard_id), 'users_widgets', 'user_id = ? && dashboard_id = ?', array(Auth::id(), 0));
+    if (dbFetchCell('select 1 from users_widgets where user_id = ? && dashboard_id = ?', array(LegacyAuth::id(),0)) == 1) {
+        dbUpdate(array('dashboard_id'=>$dashboard_id), 'users_widgets', 'user_id = ? && dashboard_id = ?', array(LegacyAuth::id(), 0));
     }
 } else {
     // load a dashboard
@@ -93,7 +93,7 @@ if (empty($vars['bare']) || $vars['bare'] == "no") {
     <div class="btn-group btn-lg">
       <button class="btn btn-default disabled" style="min-width:160px;"><span class="pull-left">Dashboards</span></button>
       <div class="btn-group">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="min-width:160px;"><span class="pull-left"><?php echo ($vars['dashboard']['user_id'] != Auth::id() ? $vars['dashboard']['username'].':' : ''); ?><?php echo $vars['dashboard']['dashboard_name']; ?></span>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="min-width:160px;"><span class="pull-left"><?php echo ($vars['dashboard']['user_id'] != LegacyAuth::id() ? $vars['dashboard']['username'].':' : ''); ?><?php echo $vars['dashboard']['dashboard_name']; ?></span>
           <span class="pull-right">
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>
@@ -539,7 +539,7 @@ if (strpos($dash_config, 'globe') !== false) {
               '</span>'+
               '<span class="fade-edit pull-right">'+
                 <?php
-                if (($vars['dashboard']['access'] == 1 && Auth::id() === $vars['dashboard']['user_id']) ||
+                if (($vars['dashboard']['access'] == 1 && LegacyAuth::id() === $vars['dashboard']['user_id']) ||
                         ($vars['dashboard']['access'] == 0 || $vars['dashboard']['access'] == 2)) {
                         echo "'<i class=\"fa fa-pencil-square-o edit-widget\" data-widget-id=\"'+data.user_widget_id+'\" aria-label=\"Settings\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Settings\">&nbsp;</i>&nbsp;'+";
                 }
diff --git a/html/pages/front/traffic.php b/html/pages/front/traffic.php
index c37e2b61c6..af28a7dbd1 100644
--- a/html/pages/front/traffic.php
+++ b/html/pages/front/traffic.php
@@ -3,7 +3,7 @@
     <td bgcolor=#e5e5e5 valign=top>
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $nodes     = array();
 $param     = array();
@@ -111,7 +111,7 @@ echo '</div>
     <td bgcolor=#e5e5e5 width=470 valign=top>';
 
 // this stuff can be customised to show whatever you want....
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $sql = "SELECT * FROM ports AS I, devices AS D WHERE `ifAlias` like 'Transit: %' AND I.device_id = D.device_id ORDER BY I.ifAlias";
     unset($seperator);
     foreach (dbFetchRows($sql) as $interface) {
diff --git a/html/pages/locations.inc.php b/html/pages/locations.inc.php
index 07d749458a..87057ef43e 100644
--- a/html/pages/locations.inc.php
+++ b/html/pages/locations.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = 'Locations';
 
@@ -39,18 +39,18 @@ print_optionbar_end();
 echo '<table cellpadding="7" cellspacing="0" class="devicetable" width="100%">';
 
 foreach (getlocations() as $location) {
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         $num        = dbFetchCell('SELECT COUNT(device_id) FROM devices WHERE location = ?', array($location));
         $net        = dbFetchCell("SELECT COUNT(device_id) FROM devices WHERE location = ? AND type = 'network'", array($location));
         $srv        = dbFetchCell("SELECT COUNT(device_id) FROM devices WHERE location = ? AND type = 'server'", array($location));
         $fwl        = dbFetchCell("SELECT COUNT(device_id) FROM devices WHERE location = ? AND type = 'firewall'", array($location));
         $hostalerts = dbFetchCell("SELECT COUNT(device_id) FROM devices WHERE location = ? AND status = '0'", array($location));
     } else {
-        $num        = dbFetchCell('SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ?', array(Auth::id(), $location));
-        $net        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND D.type = 'network'", array(Auth::id(), $location));
-        $srv        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND type = 'server'", array(Auth::id(), $location));
-        $fwl        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND type = 'firewall'", array(Auth::id(), $location));
-        $hostalerts = dbFetchCell("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND status = '0'", array(Auth::id(), $location));
+        $num        = dbFetchCell('SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ?', array(LegacyAuth::id(), $location));
+        $net        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND D.type = 'network'", array(LegacyAuth::id(), $location));
+        $srv        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND type = 'server'", array(LegacyAuth::id(), $location));
+        $fwl        = dbFetchCell("SELECT COUNT(D.device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND type = 'firewall'", array(LegacyAuth::id(), $location));
+        $hostalerts = dbFetchCell("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND status = '0'", array(LegacyAuth::id(), $location));
     }
 
     if ($hostalerts) {
diff --git a/html/pages/logon.inc.php b/html/pages/logon.inc.php
deleted file mode 100644
index def4f3a37b..0000000000
--- a/html/pages/logon.inc.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-global $twofactorform;
-if ($config['twofactor'] && isset($twofactorform)) {
-    echo \LibreNMS\Authentication\TwoFactor::getForm();
-} else {
-?>
-      <div class="row">
-        <div class="col-md-offset-4 col-md-4">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">
-                <?php echo '<img src="' . $config['title_image'] . '" class="img-responsive">'; ?>
-              </h3>
-            </div>
-            <div class="panel-body">
-              <div class="container-fluid">
-                <form class="form-horizontal" role="form" action="" method="post" name="logonform">
-                    <div class="form-group">
-                        <div class="col-md-12">
-                            <input type="text" name="username" id="username" class="form-control" placeholder="Username" required autofocus autocorrect="off" autocapitalize="off" spellcheck="false" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-md-12">
-                            <input type="password" name="password" id="password" class="form-control" placeholder="Password" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-md-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox" name="remember" id="remember" /> Remember me.
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-md-12">
-                            <button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
-                        </div>
-                    </div>
-                    <?php
-                    if (isset($auth_message)) {
-                        $msg_box[] = array('type'=>'error','message'=>$auth_message,'title'=>'Login error');
-                    }
-                    ?>
-                    </form>
-                    <script type="text/javascript">
-                    <!--
-                    document.logonform.username.focus();
-                    // -->
-                    </script>
-                    <?php
-}
-                    ?>
-                    </div>
-                  </div>
-                    <?php
-                    if (isset($config['login_message'])) {
-                        echo('<div class="panel-footer"><center>'.$config['login_message'].'</center></div>');
-                    }
-                    ?>
-                </div>
-              </div>
-            <div class="col-md-4"></div>
-          </div>
diff --git a/html/pages/notifications.inc.php b/html/pages/notifications.inc.php
index a6ef3ba986..369a57601e 100644
--- a/html/pages/notifications.inc.php
+++ b/html/pages/notifications.inc.php
@@ -22,7 +22,7 @@
  * @subpackage Notifications
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\ObjectCache;
 
 $notifications = new ObjectCache('notifications');
@@ -35,7 +35,7 @@ $notifications = new ObjectCache('notifications');
 <?php
 echo '<strong class="count-notif">' . $notifications['count'] . '</strong> Unread Notifications ';
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo '<button class="btn btn-success pull-right fa fa-plus new-notif" data-toggle="tooltip" data-placement="bottom" title="Create new notification" style="margin-top:-10px;"></button>';
 }
 
@@ -87,8 +87,8 @@ foreach ($notifications['sticky'] as $notif) {
     echo "<strong><i class='fa fa-bell-o'></i>&nbsp;${notif['title']}</strong>";
     echo "<span class='pull-right'>";
 
-    if ($notif['user_id'] != Auth::id()) {
-        $sticky_user = Auth::get()->getUser($notif['user_id']);
+    if ($notif['user_id'] != LegacyAuth::id()) {
+        $sticky_user = LegacyAuth::get()->getUser($notif['user_id']);
         echo "<code>Sticky by ${sticky_user['username']}</code>";
     } else {
         echo '<button class="btn btn-primary fa fa-bell-slash-o unstick-notif" data-toggle="tooltip" data-placement="bottom" title="Remove Sticky" style="margin-top:-10px;"></button>';
@@ -114,7 +114,7 @@ foreach ($notifications['sticky'] as $notif) {
 <?php
 foreach ($notifications['unread'] as $notif) {
     if (is_numeric($notif['source'])) {
-        $source_user = Auth::get()->getUser($notif['source']);
+        $source_user = LegacyAuth::get()->getUser($notif['source']);
         $notif['source'] = $source_user['username'];
     }
     echo '<div class="well"><div class="row"> <div class="col-md-12">';
@@ -127,7 +127,7 @@ foreach ($notifications['unread'] as $notif) {
     }
     echo "<h4 class='$class' id='${notif['notifications_id']}'>${notif['title']}<span class='pull-right'>";
 
-    if (Auth::user()->hasGlobalAdmin()) {
+    if (LegacyAuth::user()->hasGlobalAdmin()) {
         echo '<button class="btn btn-primary fa fa-bell-o stick-notif" data-toggle="tooltip" data-placement="bottom" title="Mark as Sticky" style="margin-top:-10px;"></button>';
     }
 ?>
@@ -170,7 +170,7 @@ foreach (array_reverse($notifications['read']) as $notif) {
     }
     echo  " id='${notif['notifications_id']}'>${notif['title']}";
 
-    if (Auth::user()->isAdmin()) {
+    if (LegacyAuth::user()->isAdmin()) {
         echo '<span class="pull-right"><button class="btn btn-primary fa fa-bell-o stick-notif" data-toggle="tooltip" data-placement="bottom" title="Mark as Sticky" style="margin-top:-10px;"></button></span>';
     }
 ?>
diff --git a/html/pages/plugin/admin.inc.php b/html/pages/plugin/admin.inc.php
index e5ca8ac428..ccb5a28866 100644
--- a/html/pages/plugin/admin.inc.php
+++ b/html/pages/plugin/admin.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     // Scan for new plugins and add to the database
     $new_plugins = scan_new_plugins();
 
diff --git a/html/pages/pollers/pollers.inc.php b/html/pages/pollers/pollers.inc.php
index 5b83a728b4..bf05930dcf 100644
--- a/html/pages/pollers/pollers.inc.php
+++ b/html/pages/pollers/pollers.inc.php
@@ -12,13 +12,12 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
 use LibreNMS\Config;
 
 require_once 'includes/modal/delete_poller.inc.php';
 
 ?>
-<br />
+    <br />
 
 <?php
 $query = 'SELECT *,UNIX_TIMESTAMP(NOW()) AS `now`, UNIX_TIMESTAMP(`last_polled`) AS `then` FROM `pollers` ORDER BY poller_name';
@@ -51,7 +50,7 @@ if (count($rows) !== 0) {
         }
 
         $actions = "";
-        if (Auth::user()->hasGlobalAdmin() && $old > ($step * 2)) {
+        if (\Auth::user()->hasGlobalAdmin() && $old > ($step * 2)) {
             // missed 2 polls show delete button
             $actions .= "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-id='{$poller['id']}' data-pollertype='delete-poller' name='delete-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>";
         }
@@ -109,7 +108,7 @@ if (count($rows) !== 0) {
         }
 
         $actions = "";
-        if (Auth::user()->hasGlobalAdmin() && $old > ($step * 2)) {
+        if (\Auth::user()->hasGlobalAdmin() && $old > ($step * 2)) {
             // missed 2 polls show delete button
             $actions .= "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-id='{$poller['id']}' data-pollertype='delete-cluster-poller' name='delete-cluster-poller'><i class='fa fa-trash' aria-hidden='true'></i></button>";
         }
@@ -153,7 +152,7 @@ if (count($rows) !== 0) {
             $first_row = false;
         }
     }
-        echo '
+    echo '
         </table>
         <small>
           Worker seconds indicates the maximum polling throughput a node can achieve in perfect conditions. If the consumed is close to the maximum, consider adding more threads, or better tuning your groups.<br>
diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php
index 601ef2d19f..bc72e96c48 100644
--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@@ -13,7 +13,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = "Ports";
 
@@ -93,10 +93,10 @@ if ((isset($vars['searchbar']) && $vars['searchbar'] != "hide") || !isset($vars[
     $output .= "<select name='device_id' id='device_id' class='form-control input-sm'>";
     $output .= "<option value=''>All Devices</option>";
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $results = dbFetchRows("SELECT `device_id`,`hostname`, `sysName` FROM `devices` ORDER BY `hostname`");
     } else {
-        $results = dbFetchRows("SELECT `D`.`device_id`,`D`.`hostname`, `D`.`sysname` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` ORDER BY `hostname`", array(Auth::id()));
+        $results = dbFetchRows("SELECT `D`.`device_id`,`D`.`hostname`, `D`.`sysname` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` ORDER BY `hostname`", array(LegacyAuth::id()));
     }
     foreach ($results as $data) {
         if ($data['device_id'] == $vars['device_id']) {
@@ -108,8 +108,8 @@ if ((isset($vars['searchbar']) && $vars['searchbar'] != "hide") || !isset($vars[
         $output .= "<option value='" . $data['device_id'] . "' " . $deviceselected . ">" . $ui_device . "</option>";
     }
 
-    if (!Auth::user()->hasGlobalRead()) {
-        $results = dbFetchRows("SELECT `D`.`device_id`,`D`.`hostname`, `D`.`sysName` FROM `ports` AS `I` JOIN `devices` AS `D` ON `D`.`device_id`=`I`.`device_id` JOIN `ports_perms` AS `PP` ON `PP`.`port_id`=`I`.`port_id` WHERE `PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` ORDER BY `hostname`", array(Auth::id()));
+    if (!LegacyAuth::user()->hasGlobalRead()) {
+        $results = dbFetchRows("SELECT `D`.`device_id`,`D`.`hostname`, `D`.`sysName` FROM `ports` AS `I` JOIN `devices` AS `D` ON `D`.`device_id`=`I`.`device_id` JOIN `ports_perms` AS `PP` ON `PP`.`port_id`=`I`.`port_id` WHERE `PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` ORDER BY `hostname`", array(LegacyAuth::id()));
     } else {
         $results = array();
     }
@@ -164,11 +164,11 @@ if ((isset($vars['searchbar']) && $vars['searchbar'] != "hide") || !isset($vars[
     $output .= "<select name='ifSpeed' id='ifSpeed' class='form-control input-sm'>";
     $output .= "<option value=''>All Speeds</option>";
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT `ifSpeed` FROM `ports` GROUP BY `ifSpeed` ORDER BY `ifSpeed`";
     } else {
         $sql = "SELECT `ifSpeed` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` GROUP BY `ifSpeed` ORDER BY `ifSpeed`";
-        $param[] = array(Auth::id(), Auth::id());
+        $param[] = array(LegacyAuth::id(), LegacyAuth::id());
     }
 
     foreach (dbFetchRows($sql, $param) as $data) {
@@ -188,11 +188,11 @@ if ((isset($vars['searchbar']) && $vars['searchbar'] != "hide") || !isset($vars[
     $output .= "<select name='ifType' id='ifType' class='form-control input-sm'>";
     $output .= "<option value=''>All Media</option>";
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT `ifType` FROM `ports` GROUP BY `ifType` ORDER BY `ifType`";
     } else {
         $sql = "SELECT `ifType` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` GROUP BY `ifType` ORDER BY `ifType`";
-        $param[] = array(Auth::id(), Auth::id());
+        $param[] = array(LegacyAuth::id(), LegacyAuth::id());
     }
 
     foreach (dbFetchRows($sql, $param) as $data) {
@@ -210,11 +210,11 @@ if ((isset($vars['searchbar']) && $vars['searchbar'] != "hide") || !isset($vars[
     $output .= "<select name='port_descr_type' id='port_descr_type' class='form-control input-sm'>";
     $output .= "<option value=''>All Port Types</option>";
 
-    if (Auth::user()->hasGlobalRead()) {
+    if (LegacyAuth::user()->hasGlobalRead()) {
         $sql = "SELECT `port_descr_type` FROM `ports` GROUP BY `port_descr_type` ORDER BY `port_descr_type`";
     } else {
         $sql = "SELECT `port_descr_type` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` GROUP BY `port_descr_type` ORDER BY `port_descr_type`";
-        $param[] = array(Auth::id(), Auth::id());
+        $param[] = array(LegacyAuth::id(), LegacyAuth::id());
     }
     $ports = dbFetchRows($sql, $param);
 
diff --git a/html/pages/preferences.inc.php b/html/pages/preferences.inc.php
index df06c39673..ef1e42777f 100644
--- a/html/pages/preferences.inc.php
+++ b/html/pages/preferences.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Authentication\TwoFactor;
 
 $no_refresh = true;
@@ -10,15 +10,15 @@ $pagetitle[] = 'Preferences';
 echo '<h2>User Preferences</h2>';
 echo '<hr>';
 
-if (Auth::user()->isDemoUser()) {
+if (LegacyAuth::user()->isDemoUser()) {
     demo_account();
 } else {
     if ($_POST['action'] == 'changepass') {
-        if (Auth::get()->authenticate(Auth::user()->username, $_POST['old_pass'])) {
+        if (LegacyAuth::get()->authenticate(LegacyAuth::user()->username, $_POST['old_pass'])) {
             if ($_POST['new_pass'] == '' || $_POST['new_pass2'] == '') {
                 $changepass_message = 'Password must not be blank.';
             } elseif ($_POST['new_pass'] == $_POST['new_pass2']) {
-                Auth::get()->changePassword(Auth::user()->username, $_POST['new_pass']);
+                LegacyAuth::get()->changePassword(LegacyAuth::user()->username, $_POST['new_pass']);
                 $changepass_message = 'Password Changed.';
             } else {
                 $changepass_message = "Passwords don't match.";
@@ -36,7 +36,7 @@ if (Auth::user()->isDemoUser()) {
 
     include 'includes/update-preferences-password.inc.php';
 
-    if (Auth::get()->canUpdatePasswords(Auth::user()->username)) {
+    if (LegacyAuth::get()->canUpdatePasswords(LegacyAuth::user()->username)) {
         echo '<h3>Change Password</h3>';
         echo '<hr>';
         echo "<div class='well'>";
@@ -75,103 +75,61 @@ if (Auth::user()->isDemoUser()) {
     }//end if
 
     if ($config['twofactor'] === true) {
-        if ($_POST['twofactorremove'] == 1) {
-            if (!isset($_POST['twofactor'])) {
-                echo '<div class="well"><form class="form-horizontal" role="form" action="" method="post" name="twofactorform">';
-                echo '<input type="hidden" name="twofactorremove" value="1" />';
-                echo TwoFactor::getForm(false);
-                echo '</form></div>';
-            } else {
-                $twofactor = get_user_pref('twofactor');
-                if (empty($twofactor)) {
-                    echo '<div class="alert alert-danger">Error: How did you even get here?!</div><script>window.location = "preferences/";</script>';
-                }
-
-                if (TwoFactor::verifyHOTP($twofactor['key'], $_POST['twofactor'], $twofactor['counter'])) {
-                    if (!set_user_pref('twofactor', array())) {
-                        echo '<div class="alert alert-danger">Error while disabling TwoFactor.</div>';
-                    } else {
-                        echo '<div class="alert alert-success">TwoFactor Disabled.</div>';
-                    }
-                } else {
-                    session_destroy();
-                    echo '<div class="alert alert-danger">Error: Supplied TwoFactor Token is wrong, you\'ve been logged out.</div><script>window.location = "' . $config['base_url'] . '";</script>';
-                }
-            }//end if
-        } else {
-            $twofactor = get_user_pref('twofactor');
-            echo '<script src="js/jquery.qrcode.min.js"></script>';
-            echo '<div class="well"><h3>Two-Factor Authentication</h3>';
-            if (!empty($twofactor)) {
-                $twofactor['text'] = "<div class='form-group'>
+        $twofactor = get_user_pref('twofactor');
+        echo '<script src="js/jquery.qrcode.min.js"></script>';
+        echo '<h3>Two-Factor Authentication</h3>';
+        echo '<hr>';
+        echo '<div class="well">';
+        if (!empty($twofactor)) {
+            $twofactor['text'] = "<div class='form-group'>
   <label for='twofactorkey' class='col-sm-2 control-label'>Secret Key</label>
   <div class='col-sm-4'>
     <input type='text' name='twofactorkey' autocomplete='off' disabled class='form-control input-sm' value='".$twofactor['key']."' />
   </div>
 </div>";
-                if ($twofactor['counter'] !== false) {
-                    $twofactor['uri']   = 'otpauth://hotp/'.Auth::user()->username.'?issuer=LibreNMS&counter='.$twofactor['counter'].'&secret='.$twofactor['key'];
-                    $twofactor['text'] .= "<div class='form-group'>
+            if ($twofactor['counter'] !== false) {
+                $twofactor['uri']   = 'otpauth://hotp/'.LegacyAuth::user()->username.'?issuer=LibreNMS&counter='.$twofactor['counter'].'&secret='.$twofactor['key'];
+                $twofactor['text'] .= "<div class='form-group'>
   <label for='twofactorcounter' class='col-sm-2 control-label'>Counter</label>
   <div class='col-sm-4'>
     <input type='text' name='twofactorcounter' autocomplete='off' disabled class='form-control input-sm' value='".$twofactor['counter']."' />
   </div>
 </div>";
-                } else {
-                    $twofactor['uri'] = 'otpauth://totp/'.Auth::user()->username.'?issuer=LibreNMS&secret='.$twofactor['key'];
-                }
+            } else {
+                $twofactor['uri'] = 'otpauth://totp/'.LegacyAuth::user()->username.'?issuer=LibreNMS&secret='.$twofactor['key'];
+            }
 
-                echo '<div id="twofactorqrcontainer">
+            echo '<div id="twofactorqrcontainer">
 <div id="twofactorqr"></div>
 <button class="btn btn-default" onclick="$(\'#twofactorkeycontainer\').show(); $(\'#twofactorqrcontainer\').hide();">Manual</button>
 </div>';
-                echo '<div id="twofactorkeycontainer">
+            echo '<div id="twofactorkeycontainer">
 <form id="twofactorkey" class="form-horizontal" role="form">'.$twofactor['text'].'</form>
 <button class="btn btn-default" onclick="$(\'#twofactorkeycontainer\').hide(); $(\'#twofactorqrcontainer\').show();">QR</button>
 </div>';
-                echo '<script>$("#twofactorqr").qrcode({"text": "'.$twofactor['uri'].'"}); $("#twofactorkeycontainer").hide();</script>';
-                echo '<br/><form method="post" class="form-horizontal" role="form">
-  <input type="hidden" name="twofactorremove" value="1" />
+            echo '<script>$("#twofactorqr").qrcode({"text": "'.$twofactor['uri'].'"}); $("#twofactorkeycontainer").hide();</script>';
+            echo '<br/><form method="post" class="form-horizontal" role="form" action="2fa/remove">
   <button class="btn btn-danger" type="submit">Disable TwoFactor</button>
 </form>';
-            } else {
-                if (isset($_POST['gentwofactorkey']) && isset($_POST['twofactortype'])) {
-                    $chk = get_user_pref('twofactor');
-                    if (empty($chk)) {
-                        $twofactor = array('key' => TwoFactor::genKey());
-                        if ($_POST['twofactortype'] == 'counter') {
-                            $twofactor['counter'] = 1;
-                        } else {
-                            $twofactor['counter'] = false;
-                        }
-
-                        if (!set_user_pref('twofactor', $twofactor)) {
-                            echo '<div class="alert alert-danger">Error inserting TwoFactor details. Please try again later and contact Administrator if error persists.</div>';
-                        } else {
-                            echo '<div class="alert alert-success">Added TwoFactor credentials. Please reload page.</div><script>window.location = "preferences/";</script>';
-                        }
-                    } else {
-                        echo '<div class="alert alert-danger">TwoFactor credentials already exists.</div>';
-                    }
-                } else {
-                    echo '<form method="post" class="form-horizontal" role="form">
-  <input type="hidden" name="gentwofactorkey" value="1" />
+        } else {
+                echo '<form method="post" class="form-horizontal" role="form" action="2fa/add">
   <div class="form-group">
     <label for="twofactortype" class="col-sm-2 control-label">TwoFactor Type</label>
     <div class="col-sm-4">
-      <select name="twofactortype">
-        <option value=""></option>
-        <option value="counter">Counter Based (HOTP)</option>
+      <select name="twofactortype" class="select">
         <option value="time">Time Based (TOTP)</option>
+        <option value="counter">Counter Based (HOTP)</option>
       </select>
     </div>
   </div>
-  <button class="btn btn-default" type="submit">Generate TwoFactor Secret Key</button>
+  <div class="form-group">
+      <div class="col-sm-4 col-sm-offset-1">
+        <button class="btn btn-default" type="submit">Generate TwoFactor Secret Key</button>
+      </div>
+  </div>
 </form>';
-                }//end if
-            }//end if
-            echo '</div>';
         }//end if
+        echo '</div>';
     }//end if
 }//end if
 
@@ -207,13 +165,13 @@ echo "
 
 echo "<h3>Device Permissions</h3>";
 echo "<hr>";
-echo "<div style='background-color: #e5e5e5; border: solid #e5e5e5 10px;  margin-bottom:10px;'>";
-if (Auth::user()->hasGlobalAdmin()) {
+echo '<div class="well">';
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo "<strong class='blue'>Global Administrative Access</strong>";
-} elseif (Auth::user()->hasGlobalRead()) {
+} elseif (LegacyAuth::user()->hasGlobalRead()) {
     echo "<strong class='green'>Global Viewing Access</strong>";
 } else {
-    foreach (dbFetchRows('SELECT * FROM `devices_perms` AS P, `devices` AS D WHERE `user_id` = ? AND P.device_id = D.device_id', array(Auth::id())) as $perm) {
+    foreach (dbFetchRows('SELECT * FROM `devices_perms` AS P, `devices` AS D WHERE `user_id` = ? AND P.device_id = D.device_id', array(LegacyAuth::id())) as $perm) {
     // FIXME generatedevicelink?
         echo "<a href='device/device=".$perm['device_id']."'>".$perm['hostname'].'</a><br />';
         $dev_access = 1;
diff --git a/html/pages/public.inc.php b/html/pages/public.inc.php
deleted file mode 100644
index 71181a977e..0000000000
--- a/html/pages/public.inc.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of LibreNMS
- *
- * Copyright (c) 2014 Bohdan Sanders <http://bohdans.com/>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.  Please see LICENSE.txt at the top level of
- * the source code distribution for details.
- */
-
-?>
-
-<script class="code" type="text/javascript">
-$(document).ready(function() {
-  $("#ToggleLogon").click( function()
-  {
-    document.getElementById('public-logon').style.display="block";
-    document.getElementById('public-status').style.display="none";
-  });
-  $("#ToggleStatus").click( function()
-  {
-    document.getElementById('public-logon').style.display="none";
-    document.getElementById('public-status').style.display="block";
-  });
-});
-</script>
-
-<?php
-// Set Defaults here
-$sql_param   = array();
-$pagetitle[] = 'Public Devices';
-
-$query = "SELECT * FROM `devices` WHERE 1 AND disabled='0' AND `ignore`='0' ORDER BY hostname";
-?>
-<div class="well"><h3>System Status<button class="btn btn-default" type="submit" style="float:right;" id="ToggleLogon">Logon</button></h3></div>
-  <div class="panel panel-default panel-condensed">
-    <div class="table-responsive">
-      <table class="table table-condensed">
-        <tr>
-          <th></th>
-          <th></th>
-          <th>Device</th>
-          <th></th>
-          <th>Platform</th>
-          <th>Uptime/Location</th>
-        </tr>
-<?php
-foreach (dbFetchRows($query, $sql_param) as $device) {
-    include 'includes/hostbox-public.inc.php';
-}
-?>
-      </table>
-    </div>
-  </div>
diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php
index ae20221acd..68a93ad719 100644
--- a/html/pages/routing/bgp.inc.php
+++ b/html/pages/routing/bgp.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Exceptions\InvalidIpException;
 use LibreNMS\Util\IPv6;
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     include 'includes/error-no-perm.inc.php';
 } else {
     $link_array = array(
diff --git a/html/pages/routing/vrf.inc.php b/html/pages/routing/vrf.inc.php
index d65b0c5793..d63e259d73 100644
--- a/html/pages/routing/vrf.inc.php
+++ b/html/pages/routing/vrf.inc.php
@@ -1,9 +1,9 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Exceptions\InvalidIpException;
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     include 'includes/error-no-perm.inc.php';
 } else {
     $link_array = array(
@@ -53,12 +53,12 @@ if (!Auth::user()->hasGlobalRead()) {
         if ($vars['graph'] == $type) {
             echo "<span class='pagemenu-selected'>";
         }
-        
+
         echo generate_link($descr, $link_array, array('view' => 'graphs', 'graph' => $type));
         if ($vars['graph'] == $type) {
             echo '</span>';
         }
-        
+
         $type_sep = ' | ';
     }
 
@@ -79,7 +79,7 @@ if (!Auth::user()->hasGlobalRead()) {
                 array_push($vrf_devices[$vrf_device['vrf_name']][$vrf_device['mplsVpnVrfRouteDistinguisher']], $vrf_device);
             }
         }
-        
+
         unset($ports);
         foreach (dbFetchRows("SELECT $port_fields FROM `ports` WHERE ifVrf<>0") as $port) {
             if (empty($ports[$port['ifvrf']][$port['device_id']])) {
diff --git a/html/pages/search/arp.inc.php b/html/pages/search/arp.inc.php
index 0ba7f361b6..132142ed35 100644
--- a/html/pages/search/arp.inc.php
+++ b/html/pages/search/arp.inc.php
@@ -30,15 +30,15 @@ var grid = $("#arp-search").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 // Select the devices only with ARP tables
 $sql = 'SELECT D.device_id AS device_id, `hostname`, `D`.`sysName` AS `sysName` FROM `ipv4_mac` AS M, `ports` AS P, `devices` AS D';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `D`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE M.port_id = P.port_id AND P.device_id = D.device_id $where GROUP BY `D`.`device_id`, `D`.`hostname`, `D`.`sysName` ORDER BY `hostname`";
diff --git a/html/pages/search/fdb.inc.php b/html/pages/search/fdb.inc.php
index beb47ddb19..0e4fef9a30 100644
--- a/html/pages/search/fdb.inc.php
+++ b/html/pages/search/fdb.inc.php
@@ -31,16 +31,16 @@ var grid = $("#fdb-search").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 // Select the devices only with FDB tables
 $sql = 'SELECT D.device_id AS device_id, `hostname` FROM `ports_fdb` AS F, `ports` AS P, `devices` AS D';
 
 $param = array();
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `D`.`device_id` = `DP`.`device_id`';
     $where  .= ' AND `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " WHERE F.port_id = P.port_id AND P.device_id = D.device_id $where GROUP BY `D`.`device_id`, `D`.`hostname` ORDER BY `hostname`";
diff --git a/html/pages/search/ipv4.inc.php b/html/pages/search/ipv4.inc.php
index b03432e3bf..77b54efbab 100644
--- a/html/pages/search/ipv4.inc.php
+++ b/html/pages/search/ipv4.inc.php
@@ -28,14 +28,14 @@ var grid = $("#ipv4-search").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $sql = 'SELECT `devices`.`device_id`,`hostname`,`sysName` FROM `devices`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`';
     $where  .= ' WHERE `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " $where ORDER BY `hostname`";
diff --git a/html/pages/search/ipv6.inc.php b/html/pages/search/ipv6.inc.php
index 5a98221dc4..f185220d8d 100644
--- a/html/pages/search/ipv6.inc.php
+++ b/html/pages/search/ipv6.inc.php
@@ -27,14 +27,14 @@ var grid = $("#ipv6-search").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $sql = 'SELECT `devices`.`device_id`,`hostname`, `sysName` FROM `devices`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`';
     $where  .= ' WHERE `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " $where ORDER BY `hostname`";
diff --git a/html/pages/search/mac.inc.php b/html/pages/search/mac.inc.php
index 4071bea5af..ccf05eb9d7 100644
--- a/html/pages/search/mac.inc.php
+++ b/html/pages/search/mac.inc.php
@@ -28,14 +28,14 @@ var grid = $("#mac-search").bootgrid({
                 "<option value=\"\">All Devices</option>"+
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $sql = 'SELECT `devices`.`device_id`,`hostname`, `sysName` FROM `devices`';
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $sql    .= ' LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`';
     $where  .= ' WHERE `DP`.`user_id`=?';
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $sql .= " $where ORDER BY `hostname`";
diff --git a/html/pages/search/packages.inc.php b/html/pages/search/packages.inc.php
index 411b08d386..c2cdff870c 100644
--- a/html/pages/search/packages.inc.php
+++ b/html/pages/search/packages.inc.php
@@ -23,7 +23,7 @@
  * @subpackage Search
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 print_optionbar_start(28);
 ?>
@@ -76,10 +76,10 @@ $full_query = "";
 $query = 'SELECT packages.name FROM packages,devices ';
 $param = array();
 
-if (!Auth::user()->hasGlobalRead()) {
+if (!LegacyAuth::user()->hasGlobalRead()) {
     $query .= " LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`";
     $sql_where .= " AND `DP`.`user_id`=?";
-    $param[] = Auth::id();
+    $param[] = LegacyAuth::id();
 }
 
 $query .= " WHERE packages.device_id = devices.device_id AND packages.name LIKE '%".mres($_POST['package'])."%' $sql_where GROUP BY packages.name";
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index 227f4a0d79..0889214f36 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -15,7 +15,7 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $pagetitle[] = 'Services';
 
@@ -122,12 +122,12 @@ require_once 'includes/modal/delete_service.inc.php';
                     $sql_param[] = $state;
                 }
 
-                if (Auth::user()->hasGlobalRead()) {
+                if (LegacyAuth::user()->hasGlobalRead()) {
                     $host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S WHERE D.device_id = S.device_id GROUP BY `D`.`hostname`, `D`.`device_id`, `D`.`sysName` ORDER BY D.hostname';
                     $host_par = array();
                 } else {
                     $host_sql = 'SELECT `D`.`device_id`,`D`.`hostname`,`D`.`sysName` FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY `D`.`hostname`, `D`.`device_id`, `D`.`sysName` ORDER BY D.hostname';
-                    $host_par = array(Auth::id());
+                    $host_par = array(LegacyAuth::id());
                 }
 
                 $shift = 1;
@@ -190,7 +190,7 @@ require_once 'includes/modal/delete_service.inc.php';
                         echo '<td>' . nl2br(display($service['service_desc'])) . '</td>';
                         echo '<td>' . nl2br(display($service['service_message'])) . '</td>';
 
-                        if (Auth::user()->hasGlobalAdmin()) {
+                        if (LegacyAuth::user()->hasGlobalAdmin()) {
                             echo "<td>
                                     <button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='{$service['service_id']}' name='edit-service'><i class='fa fa-pencil' aria-hidden='true'></i></button>
                                     <button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='{$service['service_id']}' name='delete-service'><i class='fa fa-trash' aria-hidden='true'></i></button>
diff --git a/html/pages/settings.inc.php b/html/pages/settings.inc.php
index 5c6cbb77a7..7b90c89b31 100644
--- a/html/pages/settings.inc.php
+++ b/html/pages/settings.inc.php
@@ -24,7 +24,7 @@
  * @author     f0o <f0o@devilcode.org>
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 ?>
 
@@ -42,7 +42,7 @@ use LibreNMS\Authentication\Auth;
 <?php
 
 
-if (Auth::user()->hasGlobalAdmin()) {
+if (LegacyAuth::user()->hasGlobalAdmin()) {
     echo '<ul class="nav nav-tabs">';
     $pages = dbFetchRows("SELECT DISTINCT `config_group` FROM `config` WHERE `config_group` IS NOT NULL AND `config_group` != ''");
     array_unshift($pages, array('config_group' => 'Global')); // Add Global tab
@@ -105,7 +105,7 @@ if (Auth::user()->hasGlobalAdmin()) {
 
         echo '<div class="table-responsive">' . a2t($config) . '</div>';
 
-        if ($debug && Auth::user()->hasGlobalAdmin()) {
+        if ($debug && LegacyAuth::user()->hasGlobalAdmin()) {
             echo("<pre>");
             print_r($config);
             echo("</pre>");
diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php
index 0d4d36015b..7bd3f36d84 100644
--- a/html/pages/settings/alerting.inc.php
+++ b/html/pages/settings/alerting.inc.php
@@ -12,7 +12,7 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 
@@ -270,7 +270,7 @@ if (isset($_GET['account']) && isset($_GET['service_key']) && isset($_GET['servi
     set_config_name('alert.pagerduty.service', $_GET['service_name']);
 }
 
-if (isset($vars['del_pagerduty']) && $vars['del_pagerduty'] == true && Auth::user()->hasGlobalAdmin()) {
+if (isset($vars['del_pagerduty']) && $vars['del_pagerduty'] == true && LegacyAuth::user()->hasGlobalAdmin()) {
     set_config_name('alert.transports.pagerduty', '');
     set_config_name('alert.pagerduty.account', '');
     set_config_name('alert.pagerduty.service', '');
diff --git a/html/pages/syslog.inc.php b/html/pages/syslog.inc.php
index 6c7fb11d30..995a323efd 100644
--- a/html/pages/syslog.inc.php
+++ b/html/pages/syslog.inc.php
@@ -13,12 +13,12 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $no_refresh = true;
 $param = array();
 
-if ($vars['action'] == 'expunge' && Auth::user()->hasGlobalAdmin()) {
+if ($vars['action'] == 'expunge' && LegacyAuth::user()->hasGlobalAdmin()) {
     dbQuery('TRUNCATE TABLE `syslog`');
     print_message('syslog truncated');
 }
diff --git a/html/pages/vminfo.inc.php b/html/pages/vminfo.inc.php
index 428f980bd2..21f1a83a0d 100644
--- a/html/pages/vminfo.inc.php
+++ b/html/pages/vminfo.inc.php
@@ -17,8 +17,6 @@
  */
 
 
-use LibreNMS\Authentication\Auth;
-
 $pagetitle[] = 'Virtual Machines';
 ?>
 <div class="table-responsive">
diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php
index 31d81e732b..197c1d5994 100644
--- a/includes/alerts.inc.php
+++ b/includes/alerts.inc.php
@@ -25,7 +25,7 @@
 use LibreNMS\Alert\Template;
 use LibreNMS\Alert\AlertData;
 use LibreNMS\Alerting\QueryBuilderParser;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Alert\AlertUtil;
 
 /**
@@ -267,7 +267,7 @@ function GetContacts($results)
     if ($config['alert']['default_only'] === true || $config['alerts']['email']['default_only'] === true) {
         return array(''.($config['alert']['default_mail'] ? $config['alert']['default_mail'] : $config['alerts']['email']['default']) => '');
     }
-    $users = Auth::get()->getUserlist();
+    $users = LegacyAuth::get()->getUserlist();
     $contacts = array();
     $uids = array();
     foreach ($results as $result) {
@@ -309,7 +309,7 @@ function GetContacts($results)
             $user['realname'] = $user['username'];
         }
         if (empty($user['level'])) {
-            $user['level'] = Auth::get()->getUserlevel($user['username']);
+            $user['level'] = LegacyAuth::get()->getUserlevel($user['username']);
         }
         if ($config['alert']['globals'] && ( $user['level'] >= 5 && $user['level'] < 10 )) {
             $contacts[$user['email']] = $user['realname'];
diff --git a/includes/caches/alerts.inc.php b/includes/caches/alerts.inc.php
index 63b86770ca..2c67e72632 100644
--- a/includes/caches/alerts.inc.php
+++ b/includes/caches/alerts.inc.php
@@ -1,12 +1,12 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $data['active_count'] = array('query' => 'SELECT COUNT(`alerts`.`id`)  FROM `alerts` LEFT JOIN `devices` ON `alerts`.`device_id`=`devices`.`device_id`  RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE 1 AND `alerts`.`state` NOT IN (0,1)');
 } else {
     $data['active_count'] = array(
         'query'  => 'SELECT COUNT(`alerts`.`id`)  FROM `alerts` LEFT JOIN `devices` ON `alerts`.`device_id`=`devices`.`device_id` LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`  RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE 1 AND `alerts`.`state` NOT IN (0,1) AND `DP`.`user_id`=?',
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 }
diff --git a/includes/caches/devices.inc.php b/includes/caches/devices.inc.php
index a6dbc3fda3..44fd5fe26f 100644
--- a/includes/caches/devices.inc.php
+++ b/includes/caches/devices.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $data['count'] = array('query' => 'SELECT COUNT(*) FROM devices');
 
     $data['up'] = array('query' => "SELECT COUNT(*) FROM devices WHERE `status` = '1' AND `ignore` = '0'  AND `disabled` = '0'",);
@@ -15,26 +15,26 @@ if (Auth::user()->hasGlobalRead()) {
 } else {
     $data['count'] = array(
         'query'  => 'SELECT COUNT(*) FROM devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id`',
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['up'] = array(
         'query'  => "SELECT COUNT(*) FROM devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND D.`status` = '1' AND D.`ignore` = '0' AND D.`disabled` = '0'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['down'] = array(
         'query'  => "SELECT COUNT(*) FROM devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND D.`status` = '0' AND D.`ignore` = '0' AND D.`disabled` = '0'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['ignored'] = array(
         'query'  => "SELECT COUNT(*) FROM devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND D.`ignore` = '1' AND D.`disabled` = '0'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['disabled'] = array(
         'query'  => "SELECT COUNT(*) FROM devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND D.`disabled` = '1'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 }//end if
diff --git a/includes/caches/notifications.inc.php b/includes/caches/notifications.inc.php
index 1be5a6b522..fbdf823404 100644
--- a/includes/caches/notifications.inc.php
+++ b/includes/caches/notifications.inc.php
@@ -22,16 +22,16 @@
  * @subpackage Notifications
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $data['count']  = array(
     'query'  => 'select count(notifications.notifications_id) from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?)',
-    'params' => array( Auth::id() )
+    'params' => array( LegacyAuth::id() )
 );
 
 $data['unread'] = array(
     'query'  => 'select notifications.* from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?) order by notifications.notifications_id desc',
-    'params' => array( Auth::id() )
+    'params' => array( LegacyAuth::id() )
 );
 
 $data['sticky'] = array(
@@ -44,5 +44,5 @@ $data['sticky_count'] = array(
 
 $data['read'] = array(
     'query'  => 'select notifications.* from notifications inner join notifications_attribs on notifications.notifications_id = notifications_attribs.notifications_id where notifications_attribs.user_id = ? && ( notifications_attribs.key = "read" && notifications_attribs.value = 1) && not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.key = "sticky" && notifications_attribs.value = "1") order by notifications_attribs.attrib_id desc',
-    'params' => array( Auth::id() )
+    'params' => array( LegacyAuth::id() )
 );
diff --git a/includes/caches/ports.inc.php b/includes/caches/ports.inc.php
index 1d2df5d359..8d37bdf363 100644
--- a/includes/caches/ports.inc.php
+++ b/includes/caches/ports.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $data['count'] = array('query' => "SELECT COUNT(*) FROM ports WHERE `deleted` = '0'");
 
     $data['up'] = array('query' => "SELECT COUNT(*) FROM ports AS I, devices AS D WHERE I.`deleted` = '0' AND D.`device_id` = I.`device_id` AND I.`ignore` = '0' AND D.`ignore` = '0' AND I.`ifOperStatus` = 'up'",);
@@ -17,31 +17,31 @@ if (Auth::user()->hasGlobalRead()) {
 } else {
     $data['count'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id`",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['up'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id` AND I.`ignore` = '0' AND D.`ignore` = '0' AND I.`ifOperStatus` = 'up'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['down'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id` AND I.`ignore` = '0' AND D.`ignore` = '0' AND I.`ifOperStatus` = 'down' AND I.`ifAdminStatus` = 'up'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['shutdown'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id` AND I.`ignore` = '0' AND D.`ignore` = '0' AND I.`ifAdminStatus` = 'down'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['errored'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id` AND I.`ignore` = '0' AND D.`ignore` = '0' AND (I.`ifInErrors_delta` > '0' OR I.`ifOutErrors_delta` > '0')",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['ignored'] = array(
         'query'  => "SELECT COUNT(*) FROM ports AS I, devices AS D, devices_perms AS P WHERE I.`deleted` = '0' AND P.`user_id` = ? AND P.`device_id` = D.`device_id` AND I.`device_id` = D.`device_id` AND (I.`ignore` = '1' OR D.`ignore` = '1')",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 }//end if
diff --git a/includes/caches/services.inc.php b/includes/caches/services.inc.php
index 951b5dcbaa..35b4a8d305 100644
--- a/includes/caches/services.inc.php
+++ b/includes/caches/services.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $data['count']    = array( 'query' => 'SELECT COUNT(*) FROM services');
     $data['up']       = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '0'");
     $data['down']     = array( 'query' => "SELECT COUNT(*) FROM services WHERE `service_ignore` = '0' AND `service_disabled` = '0' AND `service_status` = '2'");
@@ -11,26 +11,26 @@ if (Auth::user()->hasGlobalRead()) {
 } else {
     $data['count'] = array(
         'query'  => 'SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id`',
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['up'] = array(
         'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '0'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['down'] = array(
         'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '0' AND S.`service_disabled` = '0' AND S.`service_status` = '2'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['ignored'] = array(
         'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_ignore` = '1' AND S.`service_disabled` = '0'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 
     $data['disabled'] = array(
         'query'  => "SELECT COUNT(*) FROM services AS S, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND S.`device_id` = D.`device_id` AND S.`service_disabled` = '1'",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 }//end if
diff --git a/includes/caches/toner.inc.php b/includes/caches/toner.inc.php
index dbf9c081a4..00a07ec92a 100644
--- a/includes/caches/toner.inc.php
+++ b/includes/caches/toner.inc.php
@@ -1,12 +1,12 @@
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
-if (Auth::user()->hasGlobalRead()) {
+if (LegacyAuth::user()->hasGlobalRead()) {
     $data['count'] = array('query' => "SELECT COUNT(`toner_id`) FROM toner");
 } else {
     $data['count'] = array(
         'query'  => "SELECT COUNT(`toner_id`) FROM toner AS T, devices AS D, devices_perms AS P WHERE P.`user_id` = ? AND P.`device_id` = D.`device_id` AND T.`device_id` = D.`device_id`",
-        'params' => array(Auth::id()),
+        'params' => array(LegacyAuth::id()),
     );
 }
diff --git a/includes/common.php b/includes/common.php
index e6d0f79e85..fa3f877884 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -16,7 +16,7 @@
  * the source code distribution for details.
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 use LibreNMS\Exceptions\InvalidIpException;
 use LibreNMS\Util\IP;
@@ -1750,7 +1750,7 @@ function get_user_pref($name, $default = null, $user_id = null)
     }
 
     if (is_null($user_id)) {
-        $user_id = Auth::id();
+        $user_id = LegacyAuth::id();
     }
 
     $pref = dbFetchCell(
@@ -1779,7 +1779,7 @@ function set_user_pref($name, $value, $user_id = null)
 {
     global $user_prefs;
     if (is_null($user_id)) {
-        $user_id = Auth::id();
+        $user_id = LegacyAuth::id();
     }
 
     $pref = array(
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index b792c014f1..cc89d747d7 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -28,8 +28,6 @@ $config['project_id']   = strtolower($config['project_name']);
 $config['temp_dir']    = '/tmp';
 $config['log_dir']     = $config['install_dir'].'/logs';
 
-// MySQL extension to use
-$config['db']['extension']       = 'mysqli';
 // MySQL Debug level
 $config['mysql_log_level']       = 'ERROR';
 
diff --git a/includes/functions.php b/includes/functions.php
index 5d4e94fc03..69e456e5fc 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -12,7 +12,7 @@
  */
 
 use Illuminate\Database\Events\QueryExecuted;
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 use LibreNMS\Exceptions\HostExistsException;
 use LibreNMS\Exceptions\HostIpExistsException;
@@ -1007,7 +1007,7 @@ function log_event($text, $device = null, $type = null, $severity = 2, $referenc
         'datetime' => array("NOW()"),
         'severity' => $severity,
         'message' => $text,
-        'username'  => isset(Auth::user()->username) ? Auth::user()->username : '',
+        'username'  => isset(LegacyAuth::user()->username) ? LegacyAuth::user()->username : '',
      );
 
     dbInsert($insert, 'eventlog');
diff --git a/includes/init.php b/includes/init.php
index 63d8e59059..96d3970220 100644
--- a/includes/init.php
+++ b/includes/init.php
@@ -27,10 +27,10 @@
  * @param array $modules Which modules to initialize
  */
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
 
-global $config, $permissions, $vars;
+global $config, $permissions, $vars, $console_color;
 
 error_reporting(E_ERROR|E_PARSE|E_CORE_ERROR|E_COMPILE_ERROR);
 ini_set('display_errors', 1);
@@ -39,10 +39,9 @@ ini_set('display_startup_errors', 1);
 $install_dir = realpath(__DIR__ . '/..');
 chdir($install_dir);
 
-require_once $install_dir . '/includes/common.php';
-
 # composer autoload
 if (!is_file($install_dir . '/vendor/autoload.php')) {
+    require_once $install_dir . '/includes/common.php';
     c_echo("%RError: Missing dependencies%n, run: %B./scripts/composer_wrapper.php install --no-dev%n\n\n");
 }
 require_once $install_dir . '/vendor/autoload.php';
@@ -55,6 +54,7 @@ if (!function_exists('module_selected')) {
 }
 
 // function only files
+require_once $install_dir . '/includes/common.php';
 require_once $install_dir . '/includes/dbFacile.php';
 require_once $install_dir . '/includes/rrdtool.inc.php';
 require_once $install_dir . '/includes/influxdb.inc.php';
@@ -129,7 +129,7 @@ if (isset($config['php_memory_limit']) && is_numeric($config['php_memory_limit']
 }
 
 try {
-    Auth::get();
+    LegacyAuth::get();
 } catch (Exception $exception) {
     print_error('ERROR: no valid auth_mechanism defined!');
     echo $exception->getMessage() . PHP_EOL;
@@ -160,5 +160,20 @@ if (module_selected('auth', $init_modules) ||
         $config['allow_unauth_graphs'] != true
     )
 ) {
-    require $install_dir . '/html/includes/authenticate.inc.php';
+    // populate the permissions cache TODO: remove?
+    $permissions = [];
+
+    $user_id = LegacyAuth::id();
+    foreach (dbFetchColumn('SELECT device_id FROM devices_perms WHERE user_id=?', [$user_id]) as $device_id) {
+        $permissions['device'][$device_id] = 1;
+    }
+
+    foreach (dbFetchColumn('SELECT port_id FROM ports_perms WHERE user_id=?', [$user_id]) as $port_id) {
+        $permissions['port'][$port_id] = 1;
+    }
+
+    foreach (dbFetchColumn('SELECT bill_id FROM bill_perms WHERE user_id=?', [$user_id]) as $bill_id) {
+        $permissions['bill'][$bill_id] = 1;
+    }
+    unset($user_id, $device_id, $port_id, $bill_id);
 }
diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml
index 3577daf4fb..f9c2398dc0 100644
--- a/misc/db_schema.yaml
+++ b/misc/db_schema.yaml
@@ -1603,6 +1603,8 @@ ucd_diskio:
 users:
   Columns:
     - { Field: user_id, Type: int(11), 'Null': false, Extra: auto_increment }
+    - { Field: auth_type, Type: varchar(32), 'Null': true, Extra: '' }
+    - { Field: auth_id, Type: int(11), 'Null': true, Extra: '' }
     - { Field: username, Type: varchar(255), 'Null': false, Extra: '' }
     - { Field: password, Type: varchar(255), 'Null': true, Extra: '' }
     - { Field: realname, Type: varchar(64), 'Null': false, Extra: '' }
@@ -1615,7 +1617,7 @@ users:
     - { Field: remember_token, Type: varchar(100), 'Null': true, Extra: '' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [user_id], Unique: true, Type: BTREE }
-    username: { Name: username, Columns: [username], Unique: true, Type: BTREE }
+    username: { Name: username, Columns: [auth_type, username], Unique: true, Type: BTREE }
 users_prefs:
   Columns:
     - { Field: user_id, Type: int(11), 'Null': false, Extra: '' }
diff --git a/resources/views/auth/2fa.blade.php b/resources/views/auth/2fa.blade.php
new file mode 100644
index 0000000000..3b91af54d0
--- /dev/null
+++ b/resources/views/auth/2fa.blade.php
@@ -0,0 +1,104 @@
+@extends('layouts.librenmsv1')
+
+@section('javascript')
+    <script src="js/jquery.qrcode.min.js"></script>
+@endsection
+
+@section('content')
+<div class="row">
+    <div class="col-md-offset-4 col-md-4">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title center-block">
+                    <img class="logon-logo" src="{{ asset(\LibreNMS\Config::get('title_image', 'images/librenms_logo_light.svg')) }}">
+                </h3>
+            </div>
+            <div class="panel-body">
+                <div class="container-fluid">
+                    @if(session('twofactoradd'))
+                    <div class="row">
+                        <div id="twofactorqrcontainer" class="col-md-12">
+                            <h4>Scan with your Two Factor Authenticator.</h4>
+                            <div class="col-md-12 text-center" id="twofactorqr"></div>
+                            <div class="col-md-12 text-center">
+                                <button class="btn btn-default" onclick="$('#twofactorqrcontainer').hide(); $('#twofactorkeycontainer').show();">Manual</button>
+                            </div>
+                        </div>
+
+                        <div id="twofactorkeycontainer" style="display: none" class="col-md-12">
+                            <div class="col-sm-12">
+                                <h4 style="user-select: none;">Secret Key:</h4>
+                            </div>
+                            <div class="col-sm-12 text-center" style="padding: 32px 0; font-size: medium;">
+                                {{ $key }}
+                            </div>
+                            <div class="col-sm-12 text-center">
+                                <button class="btn btn-default" onclick="$('#twofactorkeycontainer').hide(); $('#twofactorqrcontainer').show();">QR</button>
+                            </div>
+                        </div>
+                        <script>$("#twofactorqr").qrcode({"text": "{!! $uri !!}"});</script>
+                    </div>
+                    @endif
+                    <div class="row">
+                        <div class="col-md-12">
+                            <form class="form-horizontal" role="form" action="{{ route('2fa.verify') }}" method="post" name="twofactorform">
+                                {{ csrf_field() }}
+                                <div class="form-group">
+                                    <div class="col-md-8 col-md-offset-2">
+                                        <div id="twoFactorErrors" class="help-block">
+                                            @foreach($errors->all() as $error)
+                                                <strong>{{ $error }}</strong>
+                                            @endforeach
+                                        </div>
+                                        @if(!$errors->has('lockout'))
+                                        <input type="text"
+                                               name="twofactor"
+                                               id="twofactor"
+                                               class="form-control"
+                                               autocomplete="off"
+                                               aria-describedby="twoFactorErrors"
+                                               placeholder="@lang('Please enter auth token')"
+                                               required autofocus>
+                                        @endif
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    @if(!$errors->has('lockout'))
+                                        <div class="col-md-12" style="margin:8px">
+                                            <button type="submit" class="btn btn-primary btn-block" name="submit" type="submit">
+                                                <i class="fa fa-btn fa-sign-in"></i> @lang('Submit')
+                                            </button>
+                                        </div>
+                                    @endif
+                                    @if(!$errors->isEmpty())
+                                        <div class="col-md-12" style="margin:8px">
+                                            <button type="submit" class="btn btn-default btn-block" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
+                                                <i class="fa fa-btn fa-sign-out" aria-hidden="true"></i>
+                                                @lang('Logout')
+                                            </button>
+                                        </div>
+                                    @endif
+                                    @if(session('twofactoradd'))
+                                        <div class="col-md-12" style="margin:8px">
+                                            <button type="submit" class="btn btn-danger btn-block" onclick="event.preventDefault(); document.getElementById('cancel-form').submit();">
+                                                <i class="fa fa-btn fa-sign-out" aria-hidden="true"></i>
+                                                @lang('Cancel')
+                                            </button>
+                                        </div>
+                                    @endif
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                        {{ csrf_field() }}
+                    </form>
+                    <form id="cancel-form" action="{{ route('2fa.cancel') }}" method="POST" style="display: none;">
+                        {{ csrf_field() }}
+                    </form>
+               </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/external-auth-failed.blade.php b/resources/views/auth/external-auth-failed.blade.php
new file mode 100644
index 0000000000..42dd9d9795
--- /dev/null
+++ b/resources/views/auth/external-auth-failed.blade.php
@@ -0,0 +1,14 @@
+@extends('layouts.librenmsv1')
+
+@section('content')
+    <div class="row">
+        <div class="col-md-offset-4 col-md-4">
+            <h1>External Authentication Failed.</h1>
+            <p>Please close your browser window to try again or contact your administrator.</p>
+            @if($message)
+                <br />
+                <p class="text-danger">{{ $message }}</p>
+            @endif
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/auth/login-form.blade.php b/resources/views/auth/login-form.blade.php
new file mode 100644
index 0000000000..b6ed258806
--- /dev/null
+++ b/resources/views/auth/login-form.blade.php
@@ -0,0 +1,53 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title center-block">
+            <img class="logon-logo" src="{{ asset(\LibreNMS\Config::get('title_image', 'images/librenms_logo_light.svg')) }}">
+        </h3>
+    </div>
+    <div class="panel-body">
+        <div class="container-fluid">
+            <form class="form-horizontal" role="form" action="{{ url('login') }}" method="post" name="logonform">
+                {{ csrf_field() }}
+                <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
+                    <div class="col-md-12">
+                        <input type="text" name="username" id="username" value="{{ old('username') }}" class="form-control" placeholder="@lang('Username')" required autofocus />
+                        @if ($errors->has('email'))
+                            <span class="help-block">
+                                        <strong>{{ $errors->first('username') }}</strong>
+                                    </span>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                    <div class="col-md-12">
+                        <input type="password" name="password" id="password" class="form-control" placeholder="@lang('Password')" />
+                        @if ($errors->has('password'))
+                            <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-12">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="remember" id="remember" /> @lang('Remember Me')
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-12">
+                        <button type="submit" class="btn btn-primary btn-block" name="submit" type="submit">
+                            <i class="fa fa-btn fa-sign-in"></i> @lang('Login')
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    @config('login_message')
+    <div class="panel-footer">{{ \LibreNMS\Config::get('login_message') }}</div>
+    @endconfig
+</div>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 0000000000..6f40485eac
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,9 @@
+@extends('layouts.librenmsv1')
+
+@section('content')
+<div class="row">
+    <div class="col-md-offset-4 col-md-4">
+        @include('auth.login-form')
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/public-status.blade.php b/resources/views/auth/public-status.blade.php
new file mode 100644
index 0000000000..1e69579462
--- /dev/null
+++ b/resources/views/auth/public-status.blade.php
@@ -0,0 +1,86 @@
+@extends('layouts.librenmsv1')
+
+@section('title')
+    @lang('Public Devices')
+@append
+
+@section('content')
+    <div id="public-status">
+        <div class="well">
+            <div class="status-header">@lang('System Status')
+            <button class="btn btn-default pull-right" type="submit" id="ToggleLogon">@lang('Logon')</button>
+            </div>
+        </div>
+        <div class="panel panel-default panel-condensed">
+            <div class="table-responsive">
+                <table class="table table-condensed">
+                    <tr>
+                        <th></th>
+                        <th id="icon-header"></th>
+                        <th>@lang('Device')</th>
+                        <th>@lang('Platform')</th>
+                        <th>@lang('Uptime')/@lang('Location')</th>
+                    </tr>
+
+                    @foreach($devices as $device)
+                        <tr>
+                            <td><span class="alert-status {{ $device->status ? 'label-success' : 'label-danger' }}"></span></td>
+                            <td><img src="{{ $device->icon }}" width="32px" height="32px"></td>
+                            <td class="device-name">{{ $device->displayName() }}</td>
+                            <td>{{ $device->hardware }} {{ $device->features }}</td>
+                            <td>{{ $device->formatUptime(true) }}<br>{{ substr($device->location, 0, 32) }}</td>
+                        </tr>
+                    @endforeach
+                </table>
+            </div>
+        </div>
+    </div>
+
+    <div id="public-logon" style="display:none;">
+        <div class="well">
+            <div class="status-header">@lang('Logon')
+                <button class="btn btn-default pull-right" type="submit" id="ToggleStatus">@lang('Status')</button>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-offset-4 col-md-4">
+                @include('auth.login-form')
+            </div>
+        </div>
+@endsection
+
+@section('css')
+    <style>
+        body {
+            padding-top: 0;
+        }
+
+        .status-header {
+            font-size: 1.7em;
+            line-height: 34px;
+        }
+
+        #icon-header {
+            width: 32px;
+        }
+
+        .device-name {
+            font-size: 1.2em;
+        }
+    </style>
+@endsection
+
+@section('javascript')
+            <script class="code" type="text/javascript">
+                $(document).ready(function () {
+                    $("#ToggleLogon").click(function () {
+                        document.getElementById('public-logon').style.display = "block";
+                        document.getElementById('public-status').style.display = "none";
+                    });
+                    $("#ToggleStatus").click(function () {
+                        document.getElementById('public-logon').style.display = "none";
+                        document.getElementById('public-status').style.display = "block";
+                    });
+                });
+            </script>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
new file mode 100644
index 0000000000..d8437bf890
--- /dev/null
+++ b/resources/views/home.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Dashboard</div>
+
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    You are logged in!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
new file mode 100644
index 0000000000..d4745b4e6b
--- /dev/null
+++ b/resources/views/layouts/app.blade.php
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="{{ app()->getLocale() }}">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
+    <title>{{ config('app.name', 'Laravel') }}</title>
+
+    <!-- Styles -->
+    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+</head>
+<body>
+    <div id="app">
+        <nav class="navbar navbar-default navbar-static-top">
+            <div class="container">
+                <div class="navbar-header">
+
+                    <!-- Collapsed Hamburger -->
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
+                        <span class="sr-only">Toggle Navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+
+                    <!-- Branding Image -->
+                    <a class="navbar-brand" href="{{ url('/') }}">
+                        {{ config('app.name', 'Laravel') }}
+                    </a>
+                </div>
+
+                <div class="collapse navbar-collapse" id="app-navbar-collapse">
+                    <!-- Left Side Of Navbar -->
+                    <ul class="nav navbar-nav">
+                        &nbsp;
+                    </ul>
+
+                    <!-- Right Side Of Navbar -->
+                    <ul class="nav navbar-nav navbar-right">
+                        <!-- Authentication Links -->
+                        @if (Auth::guest())
+                            <li><a href="{{ route('login') }}">Login</a></li>
+                            <li><a href="{{ route('register') }}">Register</a></li>
+                        @else
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+                                    {{ Auth::user()->name }} <span class="caret"></span>
+                                </a>
+
+                                <ul class="dropdown-menu" role="menu">
+                                    <li>
+                                        <a href="{{ route('logout') }}"
+                                            onclick="event.preventDefault();
+                                                     document.getElementById('logout-form').submit();">
+                                            Logout
+                                        </a>
+
+                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                            {{ csrf_field() }}
+                                        </form>
+                                    </li>
+                                </ul>
+                            </li>
+                        @endif
+                    </ul>
+                </div>
+            </div>
+        </nav>
+
+        @yield('content')
+    </div>
+
+    <!-- Scripts -->
+    <script src="{{ asset('js/app.js') }}"></script>
+</body>
+</html>
diff --git a/resources/views/layouts/librenmsv1.blade.php b/resources/views/layouts/librenmsv1.blade.php
index 5e05df56e5..cd18ffe86f 100644
--- a/resources/views/layouts/librenmsv1.blade.php
+++ b/resources/views/layouts/librenmsv1.blade.php
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ LibreNMS\Config::get('page_title_suffix') }}</title>
+    <title>{{ $pagetitle }}</title>
     <base href="{{ LibreNMS\Config::get('base_url') }}" />
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -38,11 +38,12 @@
     <link href="css/leaflet.awesome-markers.css" rel="stylesheet" type="text/css" />
     <link href="css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="css/query-builder.default.min.css" rel="stylesheet" type="text/css" />
-    <link href="{{ LibreNMS\Config::get('stylesheet', 'css/styles.css') }}?ver=291727421" rel="stylesheet" type="text/css" />
+    <link href="{{ LibreNMS\Config::get('stylesheet', 'css/styles.css') }}?ver=20180512" rel="stylesheet" type="text/css" />
     <link href="css/{{ LibreNMS\Config::get('site_style', 'light') }}.css?ver=632417642" rel="stylesheet" type="text/css" />
     @foreach(LibreNMS\Config::get('webui.custom_css', []) as $custom_css)
         <link href="{{ $custom_css }}" rel="stylesheet" type="text/css" />
     @endforeach
+    @yield('css')
 
     <script src="js/jquery.min.js"></script>
     <script src="js/bootstrap.min.js"></script>
@@ -65,7 +66,7 @@
         <script src="js/lazyload.js"></script>
     @endif
     <script src="js/select2.min.js"></script>
-    <script src="js/librenms.js"></script>
+    <script src="js/librenms.js?ver=20180512"></script>
     <script type="text/javascript">
 
         <!-- Begin
@@ -80,15 +81,16 @@
     <script type="text/javascript" src="js/overlib_mini.js"></script>
     <script type="text/javascript" src="js/toastr.min.js"></script>
     <script type="text/javascript" src="js/boot.js"></script>
+    @yield('javascript')
 </head>
 <body>
-@if(empty(session('screen_width')) && empty(session('screen_height')))
+@if(Auth::check())
     <script>updateResolution();</script>
 @endif
 
 @if(Request::get('bare') == 'yes')
     <style>body { padding-top: 0 !important; padding-bottom: 0 !important; }</style>
-@elseif(auth()->check())
+@elseif($show_menu)
     @include('layouts.menu')
 @endif
 
diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php
index a12812e930..fec8d19ab4 100644
--- a/resources/views/layouts/menu.blade.php
+++ b/resources/views/layouts/menu.blade.php
@@ -338,7 +338,15 @@
                         <li><a href="{{ url('preferences') }}"><i class="fa fa-cog fa-fw fa-lg" aria-hidden="true"></i> My Settings</a></li>
                         <li><a href="{{ url('notifications') }}"><span class="badge count-notif">{{ $notification_count }}</span> Notifications</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{ url('logout') }}"><i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> Logout</a></li>
+                        <li>
+                            <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
+                                <i class="fa fa-sign-out fa-fw fa-lg" aria-hidden="true"></i> @lang('Logout')
+                            </a>
+
+                            <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                {{ csrf_field() }}
+                            </form>
+                        </li>
                     </ul>
                 </li>
                 <li class="dropdown">
@@ -348,11 +356,13 @@
                         <li><a href="{{ url('settings') }}"><i class="fa fa-cogs fa-fw fa-lg" aria-hidden="true"></i> Global Settings</a></li>
                         <li><a href="{{ url('validate') }}"><i class="fa fa-check-circle fa-fw fa-lg" aria-hidden="true"></i> Validate Config</a></li>
                         <li role="presentation" class="divider"></li>
-                        @if(\LibreNMS\Authentication\Auth::get()->canManageUsers())
-                            <li><a href="{{ url('edituser') }}"><i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> Edit User</a></li>
-                            <li><a href="{{ url('authlog') }}"><i class="fa fa-shield fa-fw fa-lg" aria-hidden="true"></i> Auth History</a></li>
-                            <li role="presentation" class="divider"></li>
+                        @if(\LibreNMS\Authentication\LegacyAuth::get()->canManageUsers())
+                            <li><a href="{{ url('adduser') }}"><i class="fa fa-user-plus fa-fw fa-lg" aria-hidden="true"></i> Add User</a></li>
+                            <li><a href="{{ url('deluser') }}"><i class="fa fa-user-times fa-fw fa-lg" aria-hidden="true"></i> Remove User</a></li>
                         @endif
+                        <li><a href="{{ url('edituser') }}"><i class="fa fa-user-circle-o fa-fw fa-lg" aria-hidden="true"></i> Edit User</a></li>
+                        <li><a href="{{ url('authlog') }}"><i class="fa fa-shield fa-fw fa-lg" aria-hidden="true"></i> Auth History</a></li>
+                        <li role="presentation" class="divider"></li>
                         <li class="dropdown-submenu">
                             <a href="#"><i class="fa fa-th-large fa-fw fa-lg" aria-hidden="true"></i> Pollers</a>
                             <ul class="dropdown-menu scrollable-menu">
diff --git a/routes/api.php b/routes/api.php
index c641ca5e5b..d3750db2df 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
-
 /*
 |--------------------------------------------------------------------------
 | API Routes
@@ -13,6 +11,5 @@ use Illuminate\Http\Request;
 |
 */
 
-Route::middleware('auth:api')->get('/user', function (Request $request) {
-    return $request->user();
-});
+// Legacy API
+Route::any('/v0/{path?}', 'LegacyController@api')->where('path', '.*');
diff --git a/routes/web.php b/routes/web.php
index bb75adade0..0af2b7f659 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -11,53 +11,46 @@
 |
 */
 
-Route::get('/laravel', function () {
+// Auth
+Auth::routes();
 
-    // load legacy session, but don't allow it to be updated in laravel code
-    session_start();
-    session_write_close();
+// WebUI
+Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () {
+    // Test
+    Route::get('/laravel', function () {
+        return view('laravel');
+    });
 
-    if (!empty($_SESSION['user_id'])) {
-        Auth::onceUsingId($_SESSION['user_id']);
-    } else {
-        return redirect()->to('/');
+    // Two Factor Auth
+    Route::get('2fa', 'TwoFactorController@showTwoFactorForm')->name('2fa.form');
+    Route::post('2fa', 'TwoFactorController@verifyTwoFactor')->name('2fa.verify');
+    Route::post('2fa/add', 'TwoFactorController@create');
+    Route::post('2fa/cancel', 'TwoFactorController@cancelAdd')->name('2fa.cancel');
+    Route::post('2fa/remove', 'TwoFactorController@destroy');
+
+    // Ajax routes
+    Route::group(['prefix' => 'ajax'], function () {
+        Route::post('set_resolution', 'AjaxController@setResolution');
+    });
+
+    // Debugbar routes need to be here because of catch-all
+    if (config('app.env') !== 'production' && config('app.debug')) {
+        Route::get('/_debugbar/assets/stylesheets', [
+            'as' => 'debugbar-css',
+            'uses' => '\Barryvdh\Debugbar\Controllers\AssetController@css'
+        ]);
+
+        Route::get('/_debugbar/assets/javascript', [
+            'as' => 'debugbar-js',
+            'uses' => '\Barryvdh\Debugbar\Controllers\AssetController@js'
+        ]);
+
+        Route::get('/_debugbar/open', [
+            'as' => 'debugbar-open',
+            'uses' => '\Barryvdh\Debugbar\Controllers\OpenController@handler'
+        ]);
     }
 
-    $user = Auth::getUser();
-    \App\Checks::postAuth();
-    Toastr::info('Welcome ' . ($user->realname ?: $user->username));
-
-    return view('laravel');
+    // Legacy routes
+    Route::any('/{path?}', 'LegacyController@index')->where('path', '.*');
 });
-
-Route::post('/ajax/set_resolution', 'AjaxController@setResolution');
-
-
-// Debugbar routes need to be here because of catch-all
-if (config('app.env') !== 'production' && config('app.debug')) {
-    Route::get('/_debugbar/assets/stylesheets', [
-        'as' => 'debugbar-css',
-        'uses' => '\Barryvdh\Debugbar\Controllers\AssetController@css'
-    ]);
-
-    Route::get('/_debugbar/assets/javascript', [
-        'as' => 'debugbar-js',
-        'uses' => '\Barryvdh\Debugbar\Controllers\AssetController@js'
-    ]);
-
-    Route::get('/_debugbar/open', [
-        'as' => 'debugbar-open',
-        'uses' => '\Barryvdh\Debugbar\Controllers\OpenController@handler'
-    ]);
-}
-
-// Legacy routes
-Route::any('/api/v0/{path?}', 'LegacyController@api')->where('path', '.*');
-Route::any('/{path?}', 'LegacyController@index')->where('path', '.*');
-
-// should never reach this
-Route::any('/{any?}', function ($any = null) {
-    echo "Failed to find path\n";
-    echo $any . PHP_EOL;
-    dd($any);
-})->where('any', '.*');
diff --git a/scripts/auth_test.php b/scripts/auth_test.php
index 44fef7a48f..de7a3e3bd5 100755
--- a/scripts/auth_test.php
+++ b/scripts/auth_test.php
@@ -1,12 +1,11 @@
 #!/usr/bin/php
 <?php
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 
 $options = getopt('u:rldvh');
 if (isset($options['h']) || (!isset($options['l']) && !isset($options['u']))) {
     echo ' -u <username>  (Required) username to test
- -r             Reauthenticate user, (requires previous web login with "Remember me" enabled)
  -l             List all users (checks that auth can enumerate all allowed users)
  -d             Enable debug output
  -v             Enable verbose debug output
@@ -19,7 +18,7 @@ if (isset($options['d'])) {
     $debug = true;
 }
 
-$init_modules = array('web', 'auth');
+$init_modules = [];
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 if (isset($options['v'])) {
@@ -31,7 +30,7 @@ if (isset($options['v'])) {
 echo "Authentication Method: {$config['auth_mechanism']}\n";
 
 // if ldap like, check selinux
-if ($config['auth_mechanism'] = 'ldap' || $config['auth_mechanism'] = "active_directory") {
+if ($config['auth_mechanism'] == 'ldap' || $config['auth_mechanism'] == "active_directory") {
     $enforce = shell_exec('getenforce 2>/dev/null');
     if (str_contains($enforce, 'Enforcing')) {
         // has selinux
@@ -43,7 +42,7 @@ if ($config['auth_mechanism'] = 'ldap' || $config['auth_mechanism'] = "active_di
     }
 }
 try {
-    $authorizer = Auth::get();
+    $authorizer = LegacyAuth::get();
 
     // AD bind tests
     if ($authorizer instanceof \LibreNMS\Authentication\ActiveDirectoryAuthorizer) {
@@ -94,46 +93,24 @@ try {
 
     $test_username = $options['u'];
     $auth = false;
-    if (isset($options['r'])) {
-        echo "Reauthenticate Test\n";
 
-        $session = dbFetchRow(
-            'SELECT * FROM `session` WHERE `session_username`=? ORDER BY `session_id` DESC LIMIT 1',
-            array($test_username)
-        );
-        d_echo($session);
-        if (empty($session)) {
-            print_error('Requires previous login with \'Remember me\' box checked on the webui');
-            exit;
-        }
+    echo 'Password: ';
+    `stty -echo`;
+    $test_password = trim(fgets(STDIN));
+    `stty echo`;
+    echo PHP_EOL;
 
-        $token = $session['session_username'] . '|' . password_hash($session['session_username'] . $session['session_token'], PASSWORD_DEFAULT);
+    echo "Authenticate user $test_username: \n";
+    $auth = $authorizer->authenticate($test_username, $test_password);
+    unset($test_password);
 
-        $auth = $authorizer->reauthenticate($session['session_value'], $token);
-        if ($auth) {
-            print_message("Reauthentication successful.\n");
-        } else {
-            print_error('Reauthentication failed or is unsupported');
-        }
+    if ($auth) {
+        print_message("AUTH SUCCESS\n");
     } else {
-        echo 'Password: ';
-        `stty -echo`;
-        $test_password = trim(fgets(STDIN));
-        `stty echo`;
-        echo PHP_EOL;
-
-        echo "Authenticate user $test_username: \n";
-        $auth = $authorizer->authenticate($test_username, $test_password);
-        unset($test_password);
-
-        if ($auth) {
-            print_message("AUTH SUCCESS\n");
-        } else {
-            if (isset($ldap_connection)) {
-                echo ldap_error($ldap_connection) . PHP_EOL;
-            }
-            print_error('AUTH FAILURE');
+        if (isset($ldap_connection)) {
+            echo ldap_error($ldap_connection) . PHP_EOL;
         }
+        print_error('AUTH FAILURE');
     }
 
     if ($auth) {
diff --git a/sql-schema/254.sql b/sql-schema/254.sql
index e5a605d83b..8811494751 100644
--- a/sql-schema/254.sql
+++ b/sql-schema/254.sql
@@ -1 +1 @@
-ALTER TABLE `alert_templates` DROP `rule_id`;
\ No newline at end of file
+ALTER TABLE `alert_templates` DROP `rule_id`;
diff --git a/sql-schema/261.sql b/sql-schema/261.sql
index 2399a421cc..03106bea8f 100644
--- a/sql-schema/261.sql
+++ b/sql-schema/261.sql
@@ -1 +1 @@
-ALTER TABLE `devices` CHANGE `bgpLocalAs` `bgpLocalAs` INT UNSIGNED NULL DEFAULT NULL;
\ No newline at end of file
+ALTER TABLE `devices` CHANGE `bgpLocalAs` `bgpLocalAs` INT UNSIGNED NULL DEFAULT NULL;
diff --git a/sql-schema/267.sql b/sql-schema/267.sql
new file mode 100644
index 0000000000..02f8bd0b12
--- /dev/null
+++ b/sql-schema/267.sql
@@ -0,0 +1,5 @@
+ALTER TABLE users ADD auth_type varchar(32) NULL after user_id;
+ALTER TABLE users ADD auth_id int NULL after auth_type;
+DROP INDEX username ON users;
+CREATE UNIQUE INDEX username ON users (auth_type, username);
+UPDATE users SET auth_id = user_id;
diff --git a/tests/AuthHTTPTest.php b/tests/AuthHTTPTest.php
index 5ea2266934..cbac20d121 100644
--- a/tests/AuthHTTPTest.php
+++ b/tests/AuthHTTPTest.php
@@ -25,25 +25,19 @@
 
 namespace LibreNMS\Tests;
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Exceptions\AuthenticationException;
 
 // Note that as this test set depends on mres(), it is a DBTestCase even though the database is unused
 class AuthHTTPTest extends DBTestCase
 {
-    public function testReauthenticate()
-    {
-        $this->setExpectedException(AuthenticationException::class);
-        Auth::reset()->reauthenticate(null, null);
-    }
-
     // Document the modules current behaviour, so that changes trigger test failures
     public function testCapabilityFunctions()
     {
         global $config;
         $config['auth_mechanism'] = 'http-auth';
 
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->assertTrue($a->canUpdatePasswords() === 0);
         $this->assertTrue($a->changePassword(null, null) === 0);
@@ -63,7 +57,7 @@ class AuthHTTPTest extends DBTestCase
         $users = array('steve',  '   steve', 'steve   ', '   steve   ', '    steve   ', '', 'CAT');
         $vars = array('REMOTE_USER', 'PHP_AUTH_USER');
 
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         foreach ($vars as $v) {
             foreach ($users as $u) {
diff --git a/tests/AuthSSOTest.php b/tests/AuthSSOTest.php
index 79edecf7a7..e941f1ae01 100644
--- a/tests/AuthSSOTest.php
+++ b/tests/AuthSSOTest.php
@@ -25,7 +25,7 @@
 
 namespace LibreNMS\Tests;
 
-use LibreNMS\Authentication\Auth;
+use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Exceptions\AuthenticationException;
 
 class AuthSSOTest extends DBTestCase
@@ -111,7 +111,7 @@ class AuthSSOTest extends DBTestCase
 
     public function breakUser()
     {
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         if ($this->last_user !== null) {
             $r = $a->deleteUser($a->getUserid($this->last_user));
@@ -128,7 +128,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $config['sso']['create_users'] = false;
         $config['sso']['update_users'] = false;
@@ -151,7 +151,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $config['sso']['create_users'] = true;
         $config['sso']['update_users'] = false;
@@ -186,7 +186,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         // Create a random username and store it with the defaults
         $this->basicEnvironmentEnv();
@@ -212,7 +212,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->basicEnvironmentEnv();
         unset($_SERVER);
@@ -233,7 +233,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->basicEnvironmentEnv();
         unset($_SERVER['displayName']);
@@ -248,16 +248,10 @@ class AuthSSOTest extends DBTestCase
         $this->assertTrue($a->authenticate($this->makeBreakUser(), null));
     }
 
-    public function testReauthenticate()
-    {
-        $this->setExpectedException(AuthenticationException::class);
-        Auth::reset()->reauthenticate(null, null);
-    }
-
     // Document the modules current behaviour, so that changes trigger test failures
     public function testCapabilityFunctions()
     {
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->assertTrue($a->canUpdatePasswords() === 0);
         $this->assertTrue($a->changePassword(null, null) === 0);
@@ -273,7 +267,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->basicEnvironmentEnv();
         $this->assertInternalType('string', $a->getExternalUsername());
@@ -307,7 +301,7 @@ class AuthSSOTest extends DBTestCase
     public function testGetAttr()
     {
         global $config;
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $_SERVER['HTTP_VALID_ATTR'] = 'string';
         $_SERVER['alsoVALID-ATTR'] = 'otherstring';
@@ -330,7 +324,7 @@ class AuthSSOTest extends DBTestCase
     public function testTrustedProxies()
     {
         global $config;
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $config['sso']['trusted_proxies'] = array('127.0.0.1', '::1', '2001:630:50::/48', '8.8.8.0/25');
 
@@ -383,7 +377,7 @@ class AuthSSOTest extends DBTestCase
     public function testLevelCaulculationFromAttr()
     {
         global $config;
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $config['sso']['mode'] = 'env';
         $config['sso']['group_strategy'] = 'attribute';
@@ -428,7 +422,7 @@ class AuthSSOTest extends DBTestCase
         global $config;
 
         $this->basicConfig();
-        $a = Auth::reset();
+        $a = LegacyAuth::reset();
 
         $this->basicEnvironmentEnv();
 
diff --git a/tests/DBTestCase.php b/tests/DBTestCase.php
index 5c7e717f0b..dddd6805e1 100644
--- a/tests/DBTestCase.php
+++ b/tests/DBTestCase.php
@@ -25,7 +25,7 @@
 
 namespace LibreNMS\Tests;
 
-class DBTestCase extends TestCase
+abstract class DBTestCase extends TestCase
 {
     protected $db_name;
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 2f3060cfea..267682d3a3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -24,6 +24,7 @@
  */
 
 use LibreNMS\Config;
+use LibreNMS\DB\Eloquent;
 use LibreNMS\Exceptions\DatabaseConnectException;
 use LibreNMS\Util\Snmpsim;
 
diff --git a/tests/config/config.test.php b/tests/config/config.test.php
index 30d73c85bc..faa5c6cd7a 100755
--- a/tests/config/config.test.php
+++ b/tests/config/config.test.php
@@ -7,7 +7,6 @@ $config['db_host'] = '127.0.0.1';
 $config['db_user'] = 'root';
 $config['db_pass'] = '';
 $config['db_name'] = 'librenms_phpunit_78hunjuybybh';
-$config['db']['extension'] = 'mysqli';// mysql or mysqli
 
 // This is the user LibreNMS will run as
 //Please ensure this user is created and has the correct permissions to your install