diff --git a/jellyfin_kodi/database/__init__.py b/jellyfin_kodi/database/__init__.py
index b82b4741..9f5587a2 100644
--- a/jellyfin_kodi/database/__init__.py
+++ b/jellyfin_kodi/database/__init__.py
@@ -395,7 +395,13 @@ def get_credentials():
     # Migration for #145
     # TODO: CLEANUP for 1.0.0 release
     for server in credentials['Servers']:
-        if 'LocalAddress' in server:
+        if 'ManualAddress' in server:
+            server['address'] = server['ManualAddress']
+            del server['ManualAddress']
+            # If manual is present, local should always be here, but better to be safe
+            if 'LocalAddress' in server:
+                del server['LocalAddress']
+        elif 'LocalAddress' in server:
             server['address'] = server['LocalAddress']
             del server['LocalAddress']
         if 'LastConnectionMode' in server: