diff --git a/app/Mailbox.php b/app/Mailbox.php
index e3e8da8f..23819ccf 100644
--- a/app/Mailbox.php
+++ b/app/Mailbox.php
@@ -125,7 +125,11 @@ class Mailbox extends Model
      */
     public function setInPasswordAttribute($value)
     {
-        $this->attributes['in_password'] = encrypt($value);
+        if ($value != '') {
+            $this->attributes['in_password'] = encrypt($value);
+        } else {
+            $this->attributes['in_password'] = '';
+        }
     }
 
     /**