diff --git a/password_recovery.php b/password_recovery.php
index e64c6c0..982e530 100644
--- a/password_recovery.php
+++ b/password_recovery.php
@@ -289,8 +289,8 @@ class password_recovery extends rcube_plugin {
                         $this->debug($message);
                     }
                 } else {
-                    //$save['password'] = crypt($newpassword, '$1$' . rcube_utils::random_bytes(9));
-                    $save['password'] = crypt($newpassword, '$6$' . rcube_utils::random_bytes(16));
+                    $save['password'] = crypt($newpassword, '$1$' . rcube_utils::random_bytes(9));
+                    //$save['password'] = crypt($newpassword, '$6$' . rcube_utils::random_bytes(16));
                 }
 
                 if ($type != 'error' && $this->set_user_props($save)) {
@@ -460,8 +460,8 @@ class password_recovery extends rcube_plugin {
             } else {
                 $code_validity_time = (int) $this->rc->config->get('pr_confirm_code_validity_time', 30);
             }
-            //$fields[] = "token = '" . $props['token'] . "', token_validity = NOW() + INTERVAL " . $code_validity_time . " MINUTE";
-            $fields[] = "token = '" . $props['token'] . "', token_validity = NOW() + '" . $code_validity_time . " MINUTE'";
+            $fields[] = "token = '" . $props['token'] . "', token_validity = NOW() + INTERVAL " . $code_validity_time . " MINUTE";
+            //$fields[] = "token = '" . $props['token'] . "', token_validity = NOW() + '" . $code_validity_time . " MINUTE'";
         }
 
         if ($props['password']) {