Added admin check to login server
Merge branch 'npcs'