diff --git a/src/main/resources/fxml/hub_setup_device.fxml b/src/main/resources/fxml/hub_setup_device.fxml
index e5807c230..d0fa6c22e 100644
--- a/src/main/resources/fxml/hub_setup_device.fxml
+++ b/src/main/resources/fxml/hub_setup_device.fxml
@@ -46,7 +46,7 @@
 				<padding>
 					<Insets top="12"/>
 				</padding>
-				<Label text="%hub.register.setupCodeLabel" labelFor="$setupCodeField"/>
+				<Label text="%hub.register.accountKeyLabel" labelFor="$setupCodeField"/>
 				<TextField fx:id="setupCodeField" HBox.hgrow="ALWAYS"/>
 			</HBox>
 			<HBox spacing="6" alignment="CENTER_LEFT">
@@ -66,7 +66,7 @@
 					</graphic>
 				</Label>
 
-				<Label text="%hub.register.invalidSetupCode" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.invalidSetupCode}" managed="${controller.invalidSetupCode}" graphicTextGap="6">
+				<Label text="%hub.register.invalidAccountKeyLabel" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.invalidSetupCode}" managed="${controller.invalidSetupCode}" graphicTextGap="6">
 					<padding>
 						<Insets top="6"/>
 					</padding>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 866ed1e55..b7f3b0f77 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -157,8 +157,8 @@ hub.receive.description=Cryptomator is receiving and processing the response fro
 hub.register.message=New Device
 hub.register.description=This is the first Hub access from this device. Please authorize it using your Account Key.
 hub.register.nameLabel=Device Name
-hub.register.setupCodeLabel=Account Key
-hub.register.invalidSetupCode=Invalid Account Key
+hub.register.accountKeyLabel=Account Key
+hub.register.invalidAccountKeyLabel=Invalid Account Key
 hub.register.occupiedMsg=Name already in use
 hub.register.registerBtn=Confirm
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_bg.properties b/src/main/resources/i18n/strings_bg.properties
index 1b25d3bf5..cadc50965 100644
--- a/src/main/resources/i18n/strings_bg.properties
+++ b/src/main/resources/i18n/strings_bg.properties
@@ -156,8 +156,8 @@ hub.receive.description=Криптоматор получава и обрабо
 hub.register.message=Ново устройство
 hub.register.description=За пръв път посещавате Hub от това устройство. Удостоверете го, като използвате кода за настройка.
 hub.register.nameLabel=Име на устройството
-hub.register.setupCodeLabel=Код за настройка
-hub.register.invalidSetupCode=Неприемлив код за настройка
+hub.register.accountKeyLabel=Код за настройка
+hub.register.invalidAccountKeyLabel=Неприемлив код за настройка
 hub.register.occupiedMsg=Това име вече е заето
 hub.register.registerBtn=Потвърждаване
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_ca.properties b/src/main/resources/i18n/strings_ca.properties
index f9cbf2af7..5572b8fd9 100644
--- a/src/main/resources/i18n/strings_ca.properties
+++ b/src/main/resources/i18n/strings_ca.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator està rebent i processant la resposta del Hu
 hub.register.message=Nou dispositiu
 hub.register.description=Aquest és el primer accés al Hub des d'aquest dispositiu. Cal autoritzar-lo amb el codi de configuració.
 hub.register.nameLabel=Nom del dispositiu
-hub.register.setupCodeLabel=Codi de configuració
-hub.register.invalidSetupCode=El codi de configuració és invàlid
+hub.register.accountKeyLabel=Codi de configuració
+hub.register.invalidAccountKeyLabel=El codi de configuració és invàlid
 hub.register.occupiedMsg=El nom ja està en ús
 hub.register.registerBtn=Confirma
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_da.properties b/src/main/resources/i18n/strings_da.properties
index 0579997c7..11f932c17 100644
--- a/src/main/resources/i18n/strings_da.properties
+++ b/src/main/resources/i18n/strings_da.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator modtager og behandler svaret fra hubben. Ven
 hub.register.message=Ny Enhed
 hub.register.description=Dette er den første Hub adgang fra denne enhed. Godkend den med din opsætningskode.
 hub.register.nameLabel=Enheds-navn
-hub.register.setupCodeLabel=Opsætningskode
-hub.register.invalidSetupCode=Ugyldig Opsætningskode
+hub.register.accountKeyLabel=Opsætningskode
+hub.register.invalidAccountKeyLabel=Ugyldig Opsætningskode
 hub.register.occupiedMsg=Navnet er allerede i brug
 hub.register.registerBtn=Bekræft
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_de.properties b/src/main/resources/i18n/strings_de.properties
index ebd616f08..548c33def 100644
--- a/src/main/resources/i18n/strings_de.properties
+++ b/src/main/resources/i18n/strings_de.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator empfängt und verarbeitet gerade die Antwort
 hub.register.message=Neues Gerät
 hub.register.description=Dies ist der erste Hub Zugriff von diesem Gerät. Bitte autorisiere ihn mit deinem Setup Code.
 hub.register.nameLabel=Gerätename
-hub.register.setupCodeLabel=Setup Code
-hub.register.invalidSetupCode=Ungültiger Setup Code
+hub.register.accountKeyLabel=Setup Code
+hub.register.invalidAccountKeyLabel=Ungültiger Setup Code
 hub.register.occupiedMsg=Name bereits in Verwendung
 hub.register.registerBtn=Bestätigen
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_el.properties b/src/main/resources/i18n/strings_el.properties
index 15ef2c853..05e534928 100644
--- a/src/main/resources/i18n/strings_el.properties
+++ b/src/main/resources/i18n/strings_el.properties
@@ -156,8 +156,8 @@ hub.receive.description=Το Cryptomator λαμβάνει και επεξεργ
 hub.register.message=Νέα Συσκευή
 hub.register.description=Αυτή είναι η πρώτη πρόσβαση Hub από αυτήν τη συσκευή. Παρακαλούμε εξουσιοδοτήστε την χρησιμοποιώντας τον κωδικό εγκατάστασης σας.
 hub.register.nameLabel=Όνομα Συσκευής
-hub.register.setupCodeLabel=Κωδικός Εγκατάστασης
-hub.register.invalidSetupCode=Μη έγκυρος Κωδικός Εγκατάστασης
+hub.register.accountKeyLabel=Κωδικός Εγκατάστασης
+hub.register.invalidAccountKeyLabel=Μη έγκυρος Κωδικός Εγκατάστασης
 hub.register.occupiedMsg=Το όνομα χρησιμοποιείται ήδη
 hub.register.registerBtn=Επιβεβαίωση
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_es.properties b/src/main/resources/i18n/strings_es.properties
index ed7cf09c3..7190fde5f 100644
--- a/src/main/resources/i18n/strings_es.properties
+++ b/src/main/resources/i18n/strings_es.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator está recibiendo y procesando la respuesta d
 hub.register.message=Nuevo dispositivo
 hub.register.description=Este es el primer acceso a Hub desde este dispositivo. Por favor, autorízalo usando tu código de configuración.
 hub.register.nameLabel=Nombre del dispositivo
-hub.register.setupCodeLabel=Código de configuración
-hub.register.invalidSetupCode=Código de configuración incorrecto
+hub.register.accountKeyLabel=Código de configuración
+hub.register.invalidAccountKeyLabel=Código de configuración incorrecto
 hub.register.occupiedMsg=Nombre ya en uso
 hub.register.registerBtn=Confirmar
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_fil.properties b/src/main/resources/i18n/strings_fil.properties
index 969f19157..d9569ca10 100644
--- a/src/main/resources/i18n/strings_fil.properties
+++ b/src/main/resources/i18n/strings_fil.properties
@@ -156,8 +156,8 @@ hub.receive.description=Ang Cryptomator ay tumatanggap at nagpoproseso ng tugon
 hub.register.message=Bagong Device
 hub.register.description=Ito ang unang Hub access mula sa device na ito. Mangyaring pahintulutan ito gamit ang iyong setup code.
 hub.register.nameLabel=Pangalan ng device
-hub.register.setupCodeLabel=Setup Code
-hub.register.invalidSetupCode=Di-wastong Setup Code
+hub.register.accountKeyLabel=Setup Code
+hub.register.invalidAccountKeyLabel=Di-wastong Setup Code
 hub.register.occupiedMsg=Ang pangalan ay nagamit na
 hub.register.registerBtn=Kumpirmahin
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_fr.properties b/src/main/resources/i18n/strings_fr.properties
index d22a13f7a..30a1ba04f 100644
--- a/src/main/resources/i18n/strings_fr.properties
+++ b/src/main/resources/i18n/strings_fr.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator est en train de recevoir et de traiter la r
 hub.register.message=Nouvel Appareil
 hub.register.description=Il s'agit du premier accès Hub de cet appareil. Veuillez l'autoriser en utilisant votre code d'installation.
 hub.register.nameLabel=Nom de l'appareil
-hub.register.setupCodeLabel=Code de configuration
-hub.register.invalidSetupCode=Code de configuration invalide
+hub.register.accountKeyLabel=Code de configuration
+hub.register.invalidAccountKeyLabel=Code de configuration invalide
 hub.register.occupiedMsg=Nom déjà utilisé
 hub.register.registerBtn=Confirmer
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_it.properties b/src/main/resources/i18n/strings_it.properties
index c7b5bd433..6dfc22480 100644
--- a/src/main/resources/i18n/strings_it.properties
+++ b/src/main/resources/i18n/strings_it.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator sta ricevendo ed elaborando la risposta da H
 hub.register.message=Nuovo dispositivo
 hub.register.description=Questo è il primo accesso Hub da questo dispositivo. Si prega di autorizzarlo utilizzando il codice di configurazione.
 hub.register.nameLabel=Nome Del Dispositivo
-hub.register.setupCodeLabel=Codice di configurazione
-hub.register.invalidSetupCode=Codice di configurazione non valido
+hub.register.accountKeyLabel=Codice di configurazione
+hub.register.invalidAccountKeyLabel=Codice di configurazione non valido
 hub.register.occupiedMsg=Nome già in uso
 hub.register.registerBtn=Conferma
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_ja.properties b/src/main/resources/i18n/strings_ja.properties
index 752c4f209..f6bb1e65e 100644
--- a/src/main/resources/i18n/strings_ja.properties
+++ b/src/main/resources/i18n/strings_ja.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator が Hub からの応答を受信、処理中
 hub.register.message=新しいデバイス
 hub.register.description=このデバイスから初めて Hub にアクセスします。セットアップ コードを使用して、認証してください。
 hub.register.nameLabel=デバイス名
-hub.register.setupCodeLabel=セットアップ コード
-hub.register.invalidSetupCode=不正なセットアップ コード
+hub.register.accountKeyLabel=セットアップ コード
+hub.register.invalidAccountKeyLabel=不正なセットアップ コード
 hub.register.occupiedMsg=この名前は既に使われています
 hub.register.registerBtn=確認
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_nb.properties b/src/main/resources/i18n/strings_nb.properties
index f64d71e93..049e6af1b 100644
--- a/src/main/resources/i18n/strings_nb.properties
+++ b/src/main/resources/i18n/strings_nb.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator mottar og behandler svaret fra Hub. Vennligs
 hub.register.message=Ny Enhet
 hub.register.description=Dette er den første Hub-tilgangen fra denne enheten. Vennligst autoriser den ved å bruke oppsettskoden.
 hub.register.nameLabel=Enhetsnavn
-hub.register.setupCodeLabel=Installasjonkode
-hub.register.invalidSetupCode=Feil Installasjonkode
+hub.register.accountKeyLabel=Installasjonkode
+hub.register.invalidAccountKeyLabel=Feil Installasjonkode
 hub.register.occupiedMsg=Navnet er allerede i bruk
 hub.register.registerBtn=Bekreft
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_nl.properties b/src/main/resources/i18n/strings_nl.properties
index da1557bb0..88fff8e71 100644
--- a/src/main/resources/i18n/strings_nl.properties
+++ b/src/main/resources/i18n/strings_nl.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator ontvangt en verwerkt de reactie van Hub. Een
 hub.register.message=Nieuw apparaat
 hub.register.description=Dit is de eerste Hub toegang vanaf dit apparaat. Gelieve toegang te bevestigen met behulp van uw installatiecode.
 hub.register.nameLabel=Apparaatnaam
-hub.register.setupCodeLabel=Installatiecode
-hub.register.invalidSetupCode=Ongeldige installatiecode
+hub.register.accountKeyLabel=Installatiecode
+hub.register.invalidAccountKeyLabel=Ongeldige installatiecode
 hub.register.occupiedMsg=Naam al in gebruik
 hub.register.registerBtn=Bevestig
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_pl.properties b/src/main/resources/i18n/strings_pl.properties
index 6ebd9072b..e255b4bc4 100644
--- a/src/main/resources/i18n/strings_pl.properties
+++ b/src/main/resources/i18n/strings_pl.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator odbiera i przetwarza odpowiedź z Huba, pros
 hub.register.message=Nowe Urządzenie
 hub.register.description=To jest pierwszy dostęp do centrum z tego urządzenia. Proszę autoryzować go za pomocą kodu konfiguracyjnego.
 hub.register.nameLabel=Nazwa urządzenia
-hub.register.setupCodeLabel=Kod konfiguracyjny
-hub.register.invalidSetupCode=Błędny kod konfiguracyjny
+hub.register.accountKeyLabel=Kod konfiguracyjny
+hub.register.invalidAccountKeyLabel=Błędny kod konfiguracyjny
 hub.register.occupiedMsg=Nazwa jest już używana
 hub.register.registerBtn=Zatwierdź
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_pt_BR.properties b/src/main/resources/i18n/strings_pt_BR.properties
index 4b994203c..b5005085e 100644
--- a/src/main/resources/i18n/strings_pt_BR.properties
+++ b/src/main/resources/i18n/strings_pt_BR.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator está recebendo e processando a resposta do
 hub.register.message=Novo Dispositivo
 hub.register.description=Este é o primeiro acesso do Hub a partir deste dispositivo. Por favor, autorize-o usando seu código de configuração.
 hub.register.nameLabel=Nome do dispositivo
-hub.register.setupCodeLabel=Código de Configuração
-hub.register.invalidSetupCode=Código de Configuração Invalido
+hub.register.accountKeyLabel=Código de Configuração
+hub.register.invalidAccountKeyLabel=Código de Configuração Invalido
 hub.register.occupiedMsg=Este nome já está em uso
 hub.register.registerBtn=Confirme
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_ru.properties b/src/main/resources/i18n/strings_ru.properties
index 487684b1e..de6702241 100644
--- a/src/main/resources/i18n/strings_ru.properties
+++ b/src/main/resources/i18n/strings_ru.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator принимает и обрабатывае
 hub.register.message=Новое устройство
 hub.register.description=Это первый доступ к Хабу с этого устройства. Пожалуйста, авторизуйте его, используя ваш установочный код.
 hub.register.nameLabel=Имя устройства
-hub.register.setupCodeLabel=Код установки
-hub.register.invalidSetupCode=Неверный код установки
+hub.register.accountKeyLabel=Код установки
+hub.register.invalidAccountKeyLabel=Неверный код установки
 hub.register.occupiedMsg=Имя уже используется
 hub.register.registerBtn=Подтвердить
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_tr.properties b/src/main/resources/i18n/strings_tr.properties
index 44df87879..0377a9590 100644
--- a/src/main/resources/i18n/strings_tr.properties
+++ b/src/main/resources/i18n/strings_tr.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator, Hub'dan yanıtı alıyor ve işliyor. Lütf
 hub.register.message=Yeni Cihaz
 hub.register.description=Bu işlem bu cihazdan yapılan ilk Hub erişimidir. Lütfen kurulum kodunuzu kullanarak yetkilendirin.
 hub.register.nameLabel=Cihaz adı
-hub.register.setupCodeLabel=Kurulum Kodu
-hub.register.invalidSetupCode=Geçersiz Kurulum Kodu
+hub.register.accountKeyLabel=Kurulum Kodu
+hub.register.invalidAccountKeyLabel=Geçersiz Kurulum Kodu
 hub.register.occupiedMsg=Ad zaten kullanımda
 hub.register.registerBtn=Onayla
 ### Registration Success
diff --git a/src/main/resources/i18n/strings_zh.properties b/src/main/resources/i18n/strings_zh.properties
index c687242cf..211e22f9d 100644
--- a/src/main/resources/i18n/strings_zh.properties
+++ b/src/main/resources/i18n/strings_zh.properties
@@ -156,8 +156,8 @@ hub.receive.description=Cryptomator 正在接收和处理来自 Hub 的响应，
 hub.register.message=新设备
 hub.register.description=这是从此设备第一次访问 Hub，请通过设置代码进行授权
 hub.register.nameLabel=设备名称
-hub.register.setupCodeLabel=设置代码
-hub.register.invalidSetupCode=无效的设置代码
+hub.register.accountKeyLabel=设置代码
+hub.register.invalidAccountKeyLabel=无效的设置代码
 hub.register.occupiedMsg=名称已被占用
 hub.register.registerBtn=确定
 ### Registration Success