clean up UserDataMixin a bit
check for authentication rather than User type in UserDataMixin