diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 3b0ac9e..6453f36 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -58,6 +58,11 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.addSubview(indicator)
         tableView.addSubview(indicatorLable)
         
+        if let imageData = passwordEntity?.image {
+            let image = UIImage(data: imageData as Data)
+            passwordImage = image
+        }
+        
         DispatchQueue.global(qos: .userInitiated).async {
             do {
                 self.password = try self.passwordEntity!.decrypt()!
@@ -90,7 +95,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
                 self?.tableView.reloadData()
                 indicator.stopAnimating()
                 indicatorLable.isHidden = true
-                if self?.password.url != "" {
+                if self?.password.url != ""  && self?.passwordEntity?.image == nil{
                     self?.updatePasswordImage(url: self?.password.url ?? "")
                 }
             }
@@ -107,6 +112,8 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
                     self?.passwordImage = image
                     self?.tableView.reloadRows(at: [indexPath], with: UITableViewRowAnimation.automatic)
                     print("success")
+                    let imageData = UIImageJPEGRepresentation(image, 1)
+                    self?.passwordEntity?.setValue(imageData, forKey: "image")
                 case .failure(let error):
                     print(error)
                 }
diff --git a/pass/pass.xcdatamodeld/pass.xcdatamodel/contents b/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
index fb1f10e..c8e3773 100644
--- a/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
+++ b/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
@@ -6,6 +6,7 @@
         <relationship name="password" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PasswordEntity" inverseName="categories" inverseEntity="PasswordEntity" syncable="YES"/>
     </entity>
     <entity name="PasswordEntity" representedClassName="PasswordEntity" syncable="YES" codeGenerationType="class">
+        <attribute name="image" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="name" attributeType="String" syncable="YES"/>
         <attribute name="raw" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="rawPath" attributeType="String" syncable="YES"/>
@@ -13,6 +14,6 @@
     </entity>
     <elements>
         <element name="PasswordCategoryEntity" positionX="115" positionY="-9" width="128" height="90"/>
-        <element name="PasswordEntity" positionX="-63" positionY="-18" width="128" height="105"/>
+        <element name="PasswordEntity" positionX="-63" positionY="-18" width="128" height="120"/>
     </elements>
 </model>
\ No newline at end of file