diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs
index bcb6ba86..2d8b1004 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs
@@ -73,7 +73,7 @@ internal sealed partial class UserFingerprintService : IUserFingerprintService
             ExtFields = JsonSerializer.Serialize(extendProperties),
             AppName = "bbs_cn",
             BbsDeviceId = HoyolabOptions.DeviceId,
-            DeviceFp = GetRandomHexStringOfLength(13),
+            DeviceFp = string.IsNullOrEmpty(user.Fingerprint) ? GetRandomHexStringOfLength(13) : user.Fingerprint,
         };
 
         Response<DeviceFpWrapper> response = await deviceFpClient.GetFingerprintAsync(data, token).ConfigureAwait(false);
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index 2677c78a..1c4ddf73 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -133,9 +133,10 @@
                                     <TextBlock
                                         FontSize="10"
                                         Style="{StaticResource CaptionTextBlockStyle}"
-                                        Text="{Binding Inner.Version}"/>
+                                        Text="{Binding Inner.Version}"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap"/>
                                 </Border>
-
                             </StackPanel>
 
                             <TextBlock