diff --git a/po/it_IT.po b/po/it_IT.po
index 84ad733..d7e26f3 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-10 23:09-0400\n"
-"PO-Revision-Date: 2017-08-03 02:49+0000\n"
+"POT-Creation-Date: 2017-09-24 23:09-0400\n"
+"PO-Revision-Date: 2017-09-25 03:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/ring/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@
 msgid "_Remove server"
 msgstr "_Elimina il server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:251
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:302
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -50,18 +50,18 @@
 msgid "Samplerate"
 msgstr "Frequenza di campionamento"
 
-#: src/accountcreationwizard.cpp:240
+#: src/accountcreationwizard.cpp:231
 msgid ""
 "Your account was created, but we could not register your username. Try again"
 " from the settings menu."
 msgstr "Il tuo account è stato creato, ma non abbiamo potuto registrare il tuo nome utente. Riprova dal menu opzioni."
 
-#: src/accountcreationwizard.cpp:283
+#: src/accountcreationwizard.cpp:275
 msgctxt "The default username / account alias, if none is set by the user"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/accountcreationwizard.cpp:461
+#: src/accountcreationwizard.cpp:468
 msgid "Passwords don't match"
 msgstr "Le password non coincidono"
 
@@ -87,47 +87,64 @@
 msgid "ID"
 msgstr "ID"
 
-#: src/accountgeneraltab.cpp:185
+#: src/accountgeneraltab.cpp:183 src/accountgeneraltab.cpp:208
+#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
+msgid "Change password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:196
+msgid "New password and its confirmation are different"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:206
+msgid "Password changed!"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:209
+msgid "Incorrect password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:236
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountgeneraltab.cpp:196
+#: src/accountgeneraltab.cpp:247
 msgid "Type"
 msgstr "Tipo"
 
-#: src/accountgeneraltab.cpp:222
+#: src/accountgeneraltab.cpp:273
 msgid "auto-generating..."
 msgstr "auto-generazione..."
 
-#: src/accountgeneraltab.cpp:235 src/accountgeneraltab.cpp:261
+#: src/accountgeneraltab.cpp:286 src/accountgeneraltab.cpp:312
 msgid "Username"
 msgstr "Utente"
 
-#: src/accountgeneraltab.cpp:271
+#: src/accountgeneraltab.cpp:322
 msgid "Password"
 msgstr "Password"
 
-#: src/accountgeneraltab.cpp:284
+#: src/accountgeneraltab.cpp:335
 msgid "Show password"
 msgstr "Visualizza password"
 
-#: src/accountgeneraltab.cpp:290
+#: src/accountgeneraltab.cpp:341
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:300
+#: src/accountgeneraltab.cpp:351
 msgid "Voicemail number"
 msgstr "Numero voicemail"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:363
 msgid "Name service URL"
 msgstr "URL del servizio di nomi"
 
-#: src/accountgeneraltab.cpp:325
+#: src/accountgeneraltab.cpp:376
 msgid "Auto-answer calls"
 msgstr "Chiamate auto risposte"
 
-#: src/accountgeneraltab.cpp:333
+#: src/accountgeneraltab.cpp:384
 msgid "UPnP enabled"
 msgstr "UPnP abilitato"
 
@@ -144,11 +161,11 @@
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/accountimportexportview.cpp:211
+#: src/accountimportexportview.cpp:198
 msgid "Error importing account(s)"
 msgstr "Errore di importazione account"
 
-#: src/accountimportexportview.cpp:263
+#: src/accountimportexportview.cpp:245
 msgid "Error exporting account(s)"
 msgstr "Errore di esportazione account"
 
@@ -607,36 +624,37 @@
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Collega questo dispositivo ad un account RIng creato su un altro dispositivo"
 
-#: ui/accountcreationwizard.ui:105 ui/accountcreationwizard.ui:159
+#: ui/accountcreationwizard.ui:105
 msgid "Link this device to an existing account"
 msgstr "Collega questo dispositivo ad un account esistente"
 
 #: ui/accountcreationwizard.ui:120
 msgid ""
-"To link this device to another account, you first need to obtain a PIN code."
-" To generate the pin code, go to the account management setting of a "
-"previous device, choose the Ring Account to use and select \"Link another "
-"device to this account\". You will get the necessary PIN to complete this "
-"form. The PIN is only valid for 10 minutes."
-msgstr "Per collegare questo dispositivo a un altro account, devi prima ottenere un codice PIN. Per generare il codice pin, vai nelle impostazioni di gestione degli account di un dispositivo registrato precedentemente, scegli l'Account Ring che vuoi usare e scegli  \"Collega un altro dispositivo a questo account\". Ti verrà fornito il PIN necessario per completare questo modulo. Il PIN ha una validità di 10 minuti."
+"To link this device to another account, you have two possibilities. You can "
+"import your account from the DHT, but first, you need to obtain a PIN code. "
+"To generate the PIN code, go to the account management setting of a previous"
+" device, choose the Ring Account to use and select \"Link another device to "
+"this account\". You will get the necessary PIN to complete this form. The "
+"PIN is only valid for 10 minutes. Or, you can directly import your account "
+"from an archive."
+msgstr ""
 
-#: ui/accountcreationwizard.ui:128 ui/accountcreationwizard.ui:217
-#: ui/accountcreationwizard.ui:429
-msgid "Previous"
-msgstr "Precedente"
-
-#: ui/accountcreationwizard.ui:136
-msgid "Okay, I have the PIN!"
-msgstr "OK, ho il PIN!"
-
-#: ui/accountcreationwizard.ui:174
+#: ui/accountcreationwizard.ui:146
 msgid "Enter your pin:"
 msgstr "Inserire il pin:"
 
+#: ui/accountcreationwizard.ui:174
+msgid "Or import a file:"
+msgstr ""
+
 #: ui/accountcreationwizard.ui:193
 msgid "Enter your password:"
 msgstr "Inserire la password:"
 
+#: ui/accountcreationwizard.ui:217 ui/accountcreationwizard.ui:429
+msgid "Previous"
+msgstr "Precedente"
+
 #: ui/accountcreationwizard.ui:225 ui/accountcreationwizard.ui:437
 msgid "Next"
 msgstr "Prossimo"
@@ -742,10 +760,26 @@
 msgid "Account"
 msgstr "Utente"
 
-#: ui/accountgeneraltab.ui:126
+#: ui/accountgeneraltab.ui:135
 msgid "Parameters"
 msgstr "Parametri"
 
+#: ui/accountgeneraltab.ui:175
+msgid "Note: this will change the password only on this device."
+msgstr ""
+
+#: ui/accountgeneraltab.ui:194
+msgid "Current password"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:214
+msgid "New password"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:234
+msgid "Confirm password"
+msgstr ""
+
 #: ui/accountimportexportview.ui:14
 msgid "Export selected account"
 msgstr "Esporta l'account selezionato"