Fix admin portal login - use JIDs
Merge branch 'OpenfireDEMO' into release-4.6-unstable