Fixed some issues with account.users.*
Merge pull request #749 from hegek87/havoc

Fixed some issues with account.users.*