Fixed logic on admin buttons.
Merge branch 'local'