Better handling of admin settings

Better handling of admin settings
Merge pull request #128 from AlexAlexandru/master

Better handling of admin settings