Wip 7450

Fixes related to issue #7450, and access key / subuser modifications.