Fix defaults.server.locked option to be working.
Merge pull request #133 from hodduc/master

Fix defaults.server.locked option to be working.