Merge pull request #1635 from shackbarth/admin