Readd unlock button
Closes #403
Fixes #401
Merge pull request #426 from pgiraud/issue#401

Readd unlock button