- Additional work on UI7 authentication