diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 80bb6e13..296ae9e4 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -3,7 +3,8 @@
 
     <!-- Add-on settings -->
     <string id="29999">Emby for Kodi</string>
-    <string id="30000">Primary Server Address</string>
+    <string id="30000">Server address</string>
+    <string id="30001">Server name</string>
     <string id="30002">Play from HTTP instead of SMB</string>
     <string id="30004">Log level</string>
     <string id="30016">Device Name</string>
@@ -188,7 +189,7 @@
     <string id="30501">Client SSL certificate</string>
     <string id="30502">Use alternate address</string>
     <string id="30503">Alternate Server Address</string>
-    <string id="30504">Use altername device Name</string>
+    <string id="30504">Use altername device name</string>
     <string id="30505">[COLOR yellow]Retry login[/COLOR]</string>
     <string id="30506">Sync Options</string>
     <string id="30507">Show progress if item count greater than</string>
diff --git a/resources/settings.xml b/resources/settings.xml
index 406eb16d..6a7ede0a 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -9,8 +9,8 @@
 		<setting label="30600" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=connect)" visible="eq(-3,1) + eq(-1,)" option="close" />
 		<setting label="30618" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=connect)" visible="eq(-4,1) + !eq(-2,)" option="close" />
 		<!-- User settings -->
-		<setting id="serverName" label="30000" type="text" default="" />
-		<setting id="server" type="text" default="" visible="false" />
+		<setting id="serverName" label="30001" type="text" default="" />
+		<setting id="server" label="30000" type="text" default="" visible="!eq(-1,)" />
 		<setting id="sslverify" label="30500" type="bool" default="false" visible="!eq(-1,)" subsetting="true" />
 		<setting id="sslcert" label="30501" type="file" default="None" visible="eq(-1,true)" subsetting="true" />
 		<setting id="accessToken" type="text" default="" visible="false" />