Merge commits from WhiteCore

Fly-Man committed:
- UserAccount glitch fix

Greythane committed:
- AssetCaps Service updates