case 3122 - Workaround for admin user.
Merge branch 'case-3122' into artesis_clean