Fix the "cancel" button on the "admin settings" form (bug 1081929)
Merge pull request #329 from magopian/1081929-fix-cancel-when-admin-edit

Fix the "cancel" button on the "admin settings" form (bug 1081929)