Fix OPAL-2169: Merge user and application tables