diff --git a/password_encrypt.module b/password_encrypt.module
index 57d2c72203ccba646ad6ea3181c2fabaea7c2e6c..e95fa697d566440c1ffb16877caf91d10c413f21 100644
--- a/password_encrypt.module
+++ b/password_encrypt.module
@@ -132,9 +132,11 @@ function password_encrypt_form_alter(&$form, &$form_state, $form_id) {
  * Callback: called to encrypt user password.
  */
 function password_encrypt_user_decrypt_password($form, &$form_state) {
-  $password_encrypt_passkey = variable_get('password_encrypt_passkey');
-  $decrypted_pass = password_encrypt_crypto_js_aes_decrypt($password_encrypt_passkey, $form_state['values']['pass']);
-  $form_state['values']['pass'] = $decrypted_pass;
+  if(isset($form_state['values']['pass'])){
+    $password_encrypt_passkey = variable_get('password_encrypt_passkey');
+    $decrypted_pass = password_encrypt_crypto_js_aes_decrypt($password_encrypt_passkey, $form_state['values']['pass']);
+    $form_state['values']['pass'] = $decrypted_pass;
+  }
 }
 
 /**
@@ -161,7 +163,7 @@ function password_encrypt_crypto_js_aes_decrypt($passphrase, $jsonstring) {
 
   $ct = base64_decode($jsondata["ct"]);
   $concated_passphrase = $passphrase . $salt;
-  $md5 = array();
+  $md5 = [];
   $md5[0] = md5($concated_passphrase, TRUE);
   $result = $md5[0];
   for ($i = 1; $i < 3; $i++) {