diff --git a/machinery/src/routers/mqtt/main.go b/machinery/src/routers/mqtt/main.go
index bdb77a6..db35b38 100644
--- a/machinery/src/routers/mqtt/main.go
+++ b/machinery/src/routers/mqtt/main.go
@@ -376,10 +376,13 @@ func HandleRequestConfig(mqttClient mqtt.Client, hubKey string, payload models.P
 	json.Unmarshal(jsonData, &configPayload)
 
 	if configPayload.Timestamp != 0 {
-		// Get Config from the device
 
+		// Get Config from the device
 		key := configuration.Config.Key
 		name := configuration.Config.Name
+		if configuration.Config.FriendlyName != "" {
+			name = configuration.Config.FriendlyName
+		}
 
 		if key != "" && name != "" {
 
diff --git a/ui/public/locales/de/translation.json b/ui/public/locales/de/translation.json
index 57aaf71..cac32e6 100644
--- a/ui/public/locales/de/translation.json
+++ b/ui/public/locales/de/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Allgemeine Einstellungen für den Kerberos Agent",
       "key": "Schlüssel",
       "camera_name": "Kamera Name",
+      "camera_friendly_name": "Kamera Anzeigename",
       "timezone": "Zeitzone",
       "select_timezone": "Zeitzone auswählen",
       "advanced_configuration": "Erweiterte Konfiguration",
diff --git a/ui/public/locales/en/translation.json b/ui/public/locales/en/translation.json
index 0c9b94d..aeb1059 100644
--- a/ui/public/locales/en/translation.json
+++ b/ui/public/locales/en/translation.json
@@ -80,6 +80,7 @@
       "description_general": "General settings for your Kerberos Agent",
       "key": "Key",
       "camera_name": "Camera name",
+      "camera_friendly_name": "Friendly name",
       "timezone": "Timezone",
       "select_timezone": "Select a timezone",
       "advanced_configuration": "Advanced configuration",
diff --git a/ui/public/locales/es/translation.json b/ui/public/locales/es/translation.json
index 6bfa336..ae293a8 100644
--- a/ui/public/locales/es/translation.json
+++ b/ui/public/locales/es/translation.json
@@ -80,6 +80,7 @@
       "description_general": "General settings for your Kerberos Agent",
       "key": "Key",
       "camera_name": "Camera name",
+      "camera_friendly_name": "Camera friendly name",
       "timezone": "Timezone",
       "select_timezone": "Select a timezone",
       "advanced_configuration": "Advanced configuration",
diff --git a/ui/public/locales/fr/translation.json b/ui/public/locales/fr/translation.json
index 70ea86d..36416ff 100644
--- a/ui/public/locales/fr/translation.json
+++ b/ui/public/locales/fr/translation.json
@@ -79,6 +79,7 @@
       "description_general": "Paramètres généraux pour votre Agent Kerberos",
       "key": "Clé",
       "camera_name": "Nom de la caméra",
+      "camera_friendly_name": "Nom convivial de la caméra",
       "timezone": "Fuseau horaire",
       "select_timezone": "Sélectionner un fuseau horaire",
       "advanced_configuration": "Configuration avancée",
diff --git a/ui/public/locales/hi/translation.json b/ui/public/locales/hi/translation.json
index 543716f..109de73 100644
--- a/ui/public/locales/hi/translation.json
+++ b/ui/public/locales/hi/translation.json
@@ -80,6 +80,7 @@
       "description_general": "आपके Kerberos एजेंट के लिए सामान्य सेटिंग्स",
       "key": "की",
       "camera_name": "कैमरे का नाम",
+      "camera_friendly_name": "कैमरे का नाम",
       "timezone": "समय क्षेत्र",
       "select_timezone": "समयक्षेत्र चुनें",
       "advanced_configuration": "एडवांस कॉन्फ़िगरेशन",
diff --git a/ui/public/locales/it/translation.json b/ui/public/locales/it/translation.json
index 2ba9aac..36426b4 100644
--- a/ui/public/locales/it/translation.json
+++ b/ui/public/locales/it/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Impostazioni generali del Kerberos Agent",
       "key": "Chiave",
       "camera_name": "Nome videocamera",
+      "camera_friendly_name": "Nome amichevole videocamera",
       "timezone": "Fuso orario",
       "select_timezone": "Seleziona un fuso orario",
       "advanced_configuration": "Configurazione avanzata",
diff --git a/ui/public/locales/ja/translation.json b/ui/public/locales/ja/translation.json
index b85b976..6237859 100644
--- a/ui/public/locales/ja/translation.json
+++ b/ui/public/locales/ja/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Kerberos エージェントの一般設定",
       "key": "鍵",
       "camera_name": "カメラ名",
+      "camera_friendly_name": "カメラのフレンドリー名",
       "timezone": "タイムゾーン",
       "select_timezone": "タイムゾーンを選択",
       "advanced_configuration": "詳細設定",
diff --git a/ui/public/locales/nl/translation.json b/ui/public/locales/nl/translation.json
index 2d3beb2..2794484 100644
--- a/ui/public/locales/nl/translation.json
+++ b/ui/public/locales/nl/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Algemene instellingen voor jouw Kerberos Agent",
       "key": "Key",
       "camera_name": "Camera naam",
+      "camera_friendly_name": "Camera vriendelijke naam",
       "timezone": "Tijdzone",
       "select_timezone": "Selecteer uw tijdzone",
       "advanced_configuration": "Geavanceerde instellingen",
diff --git a/ui/public/locales/pl/translation.json b/ui/public/locales/pl/translation.json
index 77d53c3..8586abc 100644
--- a/ui/public/locales/pl/translation.json
+++ b/ui/public/locales/pl/translation.json
@@ -80,6 +80,7 @@
       "description_general": "General settings for your Kerberos Agent",
       "key": "Key",
       "camera_name": "Camera name",
+      "camera_friendly_name": "Camera friendly name",
       "timezone": "Timezone",
       "select_timezone": "Select a timezone",
       "advanced_configuration": "Advanced configuration",
diff --git a/ui/public/locales/pt/translation.json b/ui/public/locales/pt/translation.json
index c06c419..96cca92 100644
--- a/ui/public/locales/pt/translation.json
+++ b/ui/public/locales/pt/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Configurações gerais para seu agente Kerberos",
       "key": "Chave",
       "camera_name": "Nome da câmera",
+      "camera_friendly_name": "Nome amigável da câmera",
       "timezone": "Fuso horário",
       "select_timezone": "Selecione a timezone",
       "advanced_configuration": "Configurações avançadas",
diff --git a/ui/public/locales/ru/translation.json b/ui/public/locales/ru/translation.json
index c0fef0e..5e296f9 100644
--- a/ui/public/locales/ru/translation.json
+++ b/ui/public/locales/ru/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Общие настройки Kerberos Agent",
       "key": "Ключ",
       "camera_name": "Название камеры",
+      "camera_friendly_name": "Дружественное название камеры",
       "timezone": "Часовой пояс",
       "select_timezone": "Выберите часовой пояс",
       "advanced_configuration": "Расширенные настройки",
diff --git a/ui/public/locales/zh/translation.json b/ui/public/locales/zh/translation.json
index 7fa4ecb..b076060 100644
--- a/ui/public/locales/zh/translation.json
+++ b/ui/public/locales/zh/translation.json
@@ -80,6 +80,7 @@
       "description_general": "Kerberos Agent 常规设置",
       "key": "Key",
       "camera_name": "相机名称",
+      "camera_friendly_name": "相机友好名称",
       "timezone": "时区",
       "select_timezone": "选择时区",
       "advanced_configuration": "高级配置",
diff --git a/ui/src/pages/Settings/Settings.jsx b/ui/src/pages/Settings/Settings.jsx
index 9ca3c6c..ac8494e 100644
--- a/ui/src/pages/Settings/Settings.jsx
+++ b/ui/src/pages/Settings/Settings.jsx
@@ -824,6 +824,15 @@ class Settings extends React.Component {
                     }
                   />
 
+                  <Input
+                    noPadding
+                    label={t('settings.overview.camera_friendly_name')}
+                    defaultValue={config.friendly_name}
+                    onChange={(value) =>
+                      this.onUpdateField('', 'friendly_name', value, config)
+                    }
+                  />
+
                   <Dropdown
                     isRadio
                     icon="world"