diff --git a/idhub/models.py b/idhub/models.py
index aa2ac7c..1412f00 100644
--- a/idhub/models.py
+++ b/idhub/models.py
@@ -631,7 +631,6 @@ class VerificableCredential(models.Model):
         if self.status == self.Status.ISSUED:
             return
 
-        self.status = self.Status.ISSUED
         self.subject_did = did
         self.issued_on = datetime.datetime.now().astimezone(pytz.utc)
         issuer_pass = cache.get("KEY_DIDS")
@@ -651,6 +650,8 @@ class VerificableCredential(models.Model):
         else:
             self.data = self.user.encrypt_data(data, password)
 
+        self.status = self.Status.ISSUED
+
     def get_context(self, domain):
         d = json.loads(self.csv_data)
         issuance_date = ''