diff --git a/res/i18n/ts/cs_CZ.ts b/res/i18n/ts/cs.ts
similarity index 99%
rename from res/i18n/ts/cs_CZ.ts
rename to res/i18n/ts/cs.ts
index 10082cedd0e3bf81005017942092e4d5d6ae1939..119eb92b137451782f6714d56e8d2b38cce3d124 100644
--- a/res/i18n/ts/cs_CZ.ts
+++ b/res/i18n/ts/cs.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ" sourcelanguage="en">
+<TS version="2.0" language="cs" sourcelanguage="en">
 <context>
     <name>@default</name>
     <message>
diff --git a/res/i18n/ts/de_DE.ts b/res/i18n/ts/de.ts
similarity index 99%
rename from res/i18n/ts/de_DE.ts
rename to res/i18n/ts/de.ts
index 802afe5c3e3330b417ec530366cb241986d119ea..ad1707979cef780ac4574c8eb3237f45bd27f4e1 100644
--- a/res/i18n/ts/de_DE.ts
+++ b/res/i18n/ts/de.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="de_DE" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/res/i18n/ts/es_ES.ts b/res/i18n/ts/es.ts
similarity index 99%
rename from res/i18n/ts/es_ES.ts
rename to res/i18n/ts/es.ts
index 57f42f1d4183fe7b45960d61ed893d6c5ab7cf54..2d22dec36a56bb8dd1474bc00536264e946824d7 100644
--- a/res/i18n/ts/es_ES.ts
+++ b/res/i18n/ts/es.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="es_ES" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/res/i18n/ts/fr_FR.ts b/res/i18n/ts/fr.ts
similarity index 99%
rename from res/i18n/ts/fr_FR.ts
rename to res/i18n/ts/fr.ts
index e504837f7c7a8e5389a6a7ddf9b30f4617593c79..932df4bc090cbff81d6a0a23de0553ccd00f7124 100644
--- a/res/i18n/ts/fr_FR.ts
+++ b/res/i18n/ts/fr.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en">
+<!DOCTYPE TS><TS version="2.0" language="fr" sourcelanguage="en">
 <context>
     <name>@default</name>
     <message>
diff --git a/res/i18n/ts/it_IT.ts b/res/i18n/ts/it.ts
similarity index 99%
rename from res/i18n/ts/it_IT.ts
rename to res/i18n/ts/it.ts
index 5eed7bccf15daf770211f7067fad23eb51c91e65..43f2ec85b83dcee9edc19e1a782e222ee0721a5e 100644
--- a/res/i18n/ts/it_IT.ts
+++ b/res/i18n/ts/it.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="it_IT" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="it" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/res/i18n/ts/pl_PL.ts b/res/i18n/ts/pl.ts
similarity index 99%
rename from res/i18n/ts/pl_PL.ts
rename to res/i18n/ts/pl.ts
index 7f6f3548de31f5ac274a012a1921928595ffc785..3bcd35f638079bd400a301da2c55fbe96100dabe 100644
--- a/res/i18n/ts/pl_PL.ts
+++ b/res/i18n/ts/pl.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="pl_PL" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="pl" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/res/i18n/ts/pt_BR.ts b/res/i18n/ts/pt.ts
similarity index 99%
rename from res/i18n/ts/pt_BR.ts
rename to res/i18n/ts/pt.ts
index b3cdb8ebbc1e74964ad073ee3125926b61e648bd..58d1940b227f78482d618b8162ee5a277a47d09a 100644
--- a/res/i18n/ts/pt_BR.ts
+++ b/res/i18n/ts/pt.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="pt_BR" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="pt" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/res/i18n/ts/ru_RU.ts b/res/i18n/ts/ru.ts
similarity index 99%
rename from res/i18n/ts/ru_RU.ts
rename to res/i18n/ts/ru.ts
index 4608ddf3a225aec1e99567c8fa988df47f5b46eb..86bb350c134444bd10020a4979bd1740195e36d3 100644
--- a/res/i18n/ts/ru_RU.ts
+++ b/res/i18n/ts/ru.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="ru_RU" sourcelanguage="">
+<!DOCTYPE TS><TS version="2.0" language="ru" sourcelanguage="">
 <context>
     <name>AboutPopup</name>
     <message>
diff --git a/src/sakia/gui/dialogs/certification/model.py b/src/sakia/gui/dialogs/certification/model.py
index e9d27387e686c607fac4520e7000806952d07f96..c1ba9f6f6dcdb58fb77e1268f341010389a4cfcc 100644
--- a/src/sakia/gui/dialogs/certification/model.py
+++ b/src/sakia/gui/dialogs/certification/model.py
@@ -92,10 +92,10 @@ class CertificationModel(QObject):
     async def certify_identity(self, password, identity):
         result = await self.app.documents_service.certify(self.connection, password, identity)
         if result[0]:
-            self._identities_processor.insert_or_update_identity(identity)
             connection_identity = self._identities_processor.get_identity(self.connection.currency,
                                                                           self.connection.pubkey,
                                                                           self.connection.uid)
+            self.app.db.commit()
             self.app.identity_changed.emit(connection_identity)
             self.app.identity_changed.emit(identity)
         return result
diff --git a/src/sakia/services/documents.py b/src/sakia/services/documents.py
index 3be55c31b2e4fae14bc9252c51627b1bd2415b1d..6a75fbb57ab8c349747331a30edbd1305262fe51 100644
--- a/src/sakia/services/documents.py
+++ b/src/sakia/services/documents.py
@@ -163,6 +163,7 @@ class DocumentsService:
         responses = await self._bma_connector.broadcast(connection.currency, bma.wot.certify, req_args={'cert': signed_cert})
         result = await parse_bma_responses(responses)
         if result[0]:
+            self._identities_processor.insert_or_update_identity(identity)
             self._certifications_processor.create_or_update_certification(connection.currency, certification,
                                                                           timestamp, BlockUID.empty())