Merge pull request #16 from artemasmith/master

Fix active loc button select
Admin creation in one step.