Solve a bug with admins - refs BT#8228
Merge pull request #52 from DeEvo/8228

8228