diff --git a/app/Model/helpdesk/Email/Emails.php b/app/Model/helpdesk/Email/Emails.php
index 0468b64db..35f685f3d 100644
--- a/app/Model/helpdesk/Email/Emails.php
+++ b/app/Model/helpdesk/Email/Emails.php
@@ -60,8 +60,12 @@ class Emails extends BaseModel
 
     public function getPasswordAttribute($value)
     {
-        if ($value) {
-            return \Crypt::decrypt($value);
+        try{
+            if ($value) {
+                return \Crypt::decrypt($value);
+            }
+        } catch(\Exception $e) {
+            return null;
         }
 
         return $value;
diff --git a/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
index 60e67186d..eb8e4ed46 100644
--- a/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
@@ -67,7 +67,7 @@ class="active"
             <div class="col-xs-6 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
                 {!! Form::label('password',Lang::get('lang.password')) !!} <span class="text-red"> *</span>
                 {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!}
-                <input type="password" name="password" class="form-control" id="password" value={!! $emails->password !!} >
+                <input type="password" name="password" class="form-control" id="password">
             </div>
         </div>
     </div>