diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a7c499..a7aecbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Add ability to manage emote packs with different state keys
 ### Fixes
 - Fix amoled / theme settings not always saving properly
+- Show device name in account information correctly
 
 # Version 0.19.0 - 2020-09-21
 ### Features
diff --git a/lib/views/app_info.dart b/lib/views/app_info.dart
index 462be7e..cd826c9 100644
--- a/lib/views/app_info.dart
+++ b/lib/views/app_info.dart
@@ -37,7 +37,9 @@ class AppInfo extends StatelessWidget {
           ),
           ListTile(
             title: Text('Device name:'),
-            subtitle: Text(client.deviceName),
+            subtitle: Text(client.userDeviceKeys[client.userID]
+                    ?.deviceKeys[client.deviceID]?.deviceDisplayName ??
+                L10n.of(context).unknownDevice),
           ),
           ListTile(
             title: Text('Device ID:'),