diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index c7e6a471ab9518455e4d373b99dffc17646f0806..f45a075ba01278cb9a9a2a6f36e179cebf93b4c0 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -778,8 +778,8 @@ class simplePlugin extends plugin
     $lock_msg = "";
     if ($edit_mode) {
       /* Remove locks created by this plugin */
-      if ($remove_lock || isset($_POST['edit_cancel'])) {
-        if (session::is_set($classname) && session::is_set('edit')) {
+      if ($remove_lock || (isset($_POST['edit_cancel']) && session::is_set('edit'))) {
+        if (session::is_set($classname)) {
           del_lock($entry_dn);
         }
       }
@@ -792,8 +792,8 @@ class simplePlugin extends plugin
     } else {
       /* Reset requested? */
       if ($edit_mode && isset($_POST['edit_cancel'])) {
-        session::un_set('edit');
         session::un_set($classname);
+        session::un_set('edit');
       }
 
       /* Create account object on demand */