Update to consts
Wrong require statements
Allow for .user OR .login property