add constant for 'none' and use self.auth. elif as well