Updated to work with Servant's new authentication system
Changes